LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Packages Projects Releases 282 Wiki Activity

feedback from job

Browse source
This commit is contained in:
Jack 2016-11-02 11:32:46 -04:00
parent 660bf74d42
commit c748572bf6
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lbrynet/conf.py
View file

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