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

Merge pull request #238 from lbryio/missing-conf

Browse source 
fix missing conf file on first run
This commit is contained in:
Job Evers‐Meltzer 2016-11-02 10:49:49 -05:00 committed by GitHub
commit fee6de1c1f
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lbrynet/conf.py
View file

@ -275,7 +275,7 @@ def update_settings_from_file(filename=None):
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 OSError as ex: except (IOError, 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)
@ -290,8 +290,7 @@ settings_encoders = {
} }
def load_settings(path=None): def load_settings(path):
path = path or settings.get_conf_filename()
ext = os.path.splitext(path)[1] ext = os.path.splitext(path)[1]
with open(path, 'r') as settings_file: with open(path, 'r') as settings_file:
data = settings_file.read() data = settings_file.read()