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

fix loading settings from env

Browse source
This commit is contained in:
Alex Grintsvayg 2017-01-20 13:38:49 -05:00
parent 3aea476014
commit c62ee6bb0c
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lbrynet/conf.py
View file

@ -271,28 +271,32 @@ class Config(object):
if environment is not None: if environment is not None:
assert isinstance(environment, Env) assert isinstance(environment, Env)
for opt in environment.original_schema: for opt in environment.original_schema:
env_settings[opt] = environment(opt) if environment(opt) is not None:
env_settings[opt] = environment(opt)
return env_settings return env_settings
def _assert_valid_data_type(self, data_type): def _assert_valid_data_type(self, data_type):
assert data_type in self._data, KeyError('{} in is not a valid data type'.format(data_type)) assert data_type in self._data, KeyError('{} in is not a valid data type'.format(data_type))
def get_valid_setting_names(self):
return self._data[TYPE_DEFAULT].keys()
def _is_valid_setting(self, name): def _is_valid_setting(self, name):
return name in self._data[TYPE_DEFAULT] return name in self.get_valid_setting_names()
def _assert_valid_setting(self, name): def _assert_valid_setting(self, name):
assert self._is_valid_setting(name), \ assert self._is_valid_setting(name), \
KeyError('{} in is not a valid setting'.format(name)) KeyError('{} is not a valid setting'.format(name))
def _validate_settings(self, data): def _validate_settings(self, data):
for name in data: invalid_settings = set(data.keys()) - set(self.get_valid_setting_names())
if not self._is_valid_setting(name): if len(invalid_settings) > 0:
raise KeyError('{} in is not a valid setting'.format(name)) raise KeyError('invalid settings: {}'.format(', '.join(invalid_settings)))
def _assert_editable_setting(self, name): def _assert_editable_setting(self, name):
self._assert_valid_setting(name) self._assert_valid_setting(name)
assert name not in self._fixed_defaults, \ assert name not in self._fixed_defaults, \
ValueError('{} in is not an editable setting'.format(name)) ValueError('{} is not an editable setting'.format(name))
def get(self, name, data_type=None): def get(self, name, data_type=None):
"""Get a config value """Get a config value
@ -345,14 +349,14 @@ class Config(object):
def get_current_settings_dict(self): def get_current_settings_dict(self):
current_settings = {} current_settings = {}
for k, v in self._data[TYPE_DEFAULT].iteritems(): for key in self.get_valid_setting_names():
current_settings[k] = self.get(k) current_settings[key] = self.get(key)
return current_settings return current_settings
def get_adjustable_settings_dict(self): def get_adjustable_settings_dict(self):
return { return {
opt: val for opt, val in self.get_current_settings_dict().iteritems() key: val for key, val in self.get_current_settings_dict().iteritems()
if opt in self._adjustable_defaults if key in self._adjustable_defaults
} }
def save_conf_file_settings(self): def save_conf_file_settings(self):
@ -446,7 +450,13 @@ settings = None
def get_default_env(): def get_default_env():
return Env(**ADJUSTABLE_SETTINGS) env_defaults = {}
for k, v in ADJUSTABLE_SETTINGS.iteritems():
if len(v) == 3:
env_defaults[k] = (v[0], None, v[2])
else:
env_defaults[k] = (v[0], None)
return Env(**env_defaults)
def initialize_settings(load_conf_file=True): def initialize_settings(load_conf_file=True):