feedback from job

This commit is contained in:
Jack 2016-11-02 11:32:46 -04:00
parent 660bf74d42
commit c748572bf6

View file

@ -271,15 +271,12 @@ class Config(DefaultSettings):
def update_settings_from_file(filename=None): def update_settings_from_file(filename=None):
filename = filename or settings.get_conf_filename() filename = filename or settings.get_conf_filename()
if os.path.isfile(filename): try:
try: updates = load_settings(filename)
updates = load_settings(filename) log.info("Loaded settings file: %s", updates)
log.info("Loaded settings file: %s", updates) settings.update(updates)
settings.update(updates) except (IOError, OSError) as ex:
except OSError as ex: log.info('%s: Failed to update settings from %s', ex, filename)
log.info('%s: Failed to update settings from %s', ex, filename)
else:
log.warning("Invalid settings file path")
settings_decoders = { settings_decoders = {