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.
This commit is contained in:
18
weather.py
18
weather.py
@@ -89,14 +89,10 @@ class Selections:
|
|||||||
return self.config.get(argument, option)
|
return self.config.get(argument, option)
|
||||||
if option in self.options.__dict__:
|
if option in self.options.__dict__:
|
||||||
return self.options.__dict__[option]
|
return self.options.__dict__[option]
|
||||||
else:
|
import sys
|
||||||
import os, sys
|
message = "WARNING: no URI defined for %s\n" % option
|
||||||
message = "%s error: no URI defined for %s\n" % (
|
sys.stderr.write(message)
|
||||||
os.path.basename( sys.argv[0] ),
|
return None
|
||||||
option
|
|
||||||
)
|
|
||||||
sys.stderr.write(message)
|
|
||||||
exit(1)
|
|
||||||
def get_bool(self, option, argument=None):
|
def get_bool(self, option, argument=None):
|
||||||
"""Get data and coerce to a boolean if necessary."""
|
"""Get data and coerce to a boolean if necessary."""
|
||||||
return bool(self.get(option, argument))
|
return bool(self.get(option, argument))
|
||||||
@@ -324,11 +320,7 @@ def get_alert(
|
|||||||
):
|
):
|
||||||
"""Return alert notice for the specified URI."""
|
"""Return alert notice for the specified URI."""
|
||||||
if not uri:
|
if not uri:
|
||||||
import os, sys
|
return ""
|
||||||
message = "%s error: Alert URI required for alerts\n" % \
|
|
||||||
os.path.basename( sys.argv[0] )
|
|
||||||
sys.stderr.write(message)
|
|
||||||
sys.exit(1)
|
|
||||||
alert = get_uri(
|
alert = get_uri(
|
||||||
uri,
|
uri,
|
||||||
ignore_fail=True,
|
ignore_fail=True,
|
||||||
|
|||||||
Reference in New Issue
Block a user