From a1fe816de3d58ad614ee34af1eed6920b7edf714 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Sat, 25 Jul 2020 15:32:44 +0000 Subject: [PATCH] Make missing alert URLs non-fatal As a more complete fix and future-proofing for the earlier mismatch between default_atypes and the alert URLs generated for WX zones during correlation, stop aborting and simply add a warning if a requested alert type has no corresponding URL. --- weather.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/weather.py b/weather.py index 803525f..b0c5855 100644 --- a/weather.py +++ b/weather.py @@ -89,14 +89,10 @@ class Selections: return self.config.get(argument, option) if option in self.options.__dict__: return self.options.__dict__[option] - else: - import os, sys - message = "%s error: no URI defined for %s\n" % ( - os.path.basename( sys.argv[0] ), - option - ) - sys.stderr.write(message) - exit(1) + import sys + message = "WARNING: no URI defined for %s\n" % option + sys.stderr.write(message) + return None def get_bool(self, option, argument=None): """Get data and coerce to a boolean if necessary.""" return bool(self.get(option, argument)) @@ -324,11 +320,7 @@ def get_alert( ): """Return alert notice for the specified URI.""" if not uri: - import os, sys - message = "%s error: Alert URI required for alerts\n" % \ - os.path.basename( sys.argv[0] ) - sys.stderr.write(message) - sys.exit(1) + return "" alert = get_uri( uri, ignore_fail=True, -- 2.11.0