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

use json conf file if not given yml

Browse source
This commit is contained in:
Jack 2016-11-05 14:23:48 -04:00
parent ab15074ae4
commit 297865902b
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lbrynet/conf.py
View file

@ -266,7 +266,7 @@ class Config(DefaultSettings):
return os.path.join(self.ensure_data_dir(), self.LOG_FILE_NAME) return os.path.join(self.ensure_data_dir(), self.LOG_FILE_NAME)
def get_conf_filename(self): def get_conf_filename(self):
return os.path.join(self.ensure_data_dir(), "daemon_settings.yml") return get_settings_file_ext(self.ensure_data_dir())
def update_settings_from_file(filename=None): def update_settings_from_file(filename=None):
@ -279,6 +279,17 @@ def update_settings_from_file(filename=None):
log.info('%s: Failed to update settings from %s', ex, filename) log.info('%s: Failed to update settings from %s', ex, filename)
def get_settings_file_ext(data_dir):
yml_path = os.path.join(data_dir, "daemon_settings.yml")
json_path = os.path.join(data_dir, "daemon_settings.json")
if os.path.isfile(yml_path):
return yml_path
elif os.path.isfile(json_path):
return json_path
else:
return yml_path
settings_decoders = { settings_decoders = {
'.json': json.loads, '.json': json.loads,
'.yml': yaml.load '.yml': yaml.load