Raise Exception if watch_tools has an unrecognized value

Also do not log message "Watchdog library unavailable" if watch_tools is
False
This commit is contained in:
Nicola Soranzo
2016-05-26 11:59:08 +01:00
parent 27b70ca984
commit 4bfcce0d56
+10 -6
View File
@@ -23,19 +23,23 @@ def get_observer_class(config_value, default, monitor_what_str):
config_value = config_value or default
config_value = str(config_value).lower()
if config_value in ("true", "yes", "on", "auto"):
expect_observer = config_value != "auto"
expect_observer = True
observer_class = Observer
elif config_value == "polling":
expect_observer = True
observer_class = PollingObserver
else:
elif config_value in ('false', 'no', 'off'):
expect_observer = False
observer_class = None
else:
message = "Unrecognized value for watch_tools config option: %s" % config_value
raise Exception(message)
if observer_class is None:
message = "Watchdog library unavailble, cannot monitor %s." % monitor_what_str
log.info(message)
if expect_observer:
if expect_observer and observer_class is None:
message = "Watchdog library unavailable, cannot monitor %s." % monitor_what_str
if config_value == "auto":
log.info(message)
else:
raise Exception(message)
return observer_class