erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: log filenames of read config files

Browse source
This commit is contained in:
Goffi 2020-01-29 19:42:02 +01:00
commit ec5a51bebb
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sat/memory/memory.py
View file

@ -237,7 +237,7 @@ class Memory(object):
self.disco = Discovery(host) self.disco = Discovery(host)
# XXX: tmp update code, will be removed in the future # XXX: tmp update code, will be removed in the future
tools_config.fixLocalDir(False) tools_config.fixLocalDir(False)
self.config = tools_config.parseMainConf() self.config = tools_config.parseMainConf(log_filenames=True)
database_file = os.path.expanduser( database_file = os.path.expanduser(
os.path.join(self.getConfig("", "local_dir"), C.SAVEFILE_DATABASE) os.path.join(self.getConfig("", "local_dir"), C.SAVEFILE_DATABASE)
) )

15
sat/tools/config.py
View file

@ -99,13 +99,22 @@ def fixLocalDir(silent=True):
fixConfigOption("", "local_dir", old_default, silent) fixConfigOption("", "local_dir", old_default, silent)
def parseMainConf(): def parseMainConf(log_filenames=False):
"""look for main .ini configuration file, and parse it""" """Look for main .ini configuration file, and parse it
@param log_filenames(bool): if True, log filenames of read config files
"""
config = ConfigParser(defaults=C.DEFAULT_CONFIG) config = ConfigParser(defaults=C.DEFAULT_CONFIG)
try: try:
config.read(C.CONFIG_FILES) filenames = config.read(C.CONFIG_FILES)
except Exception as e: except Exception as e:
log.error(_("Can't read main config: {msg}").format(msg=e), exc_info=True) log.error(_("Can't read main config: {msg}").format(msg=e), exc_info=True)
else:
if log_filenames:
log.info(
_("Configuration was read from: {filenames}").format(
filenames=', '.join(filenames)))
return config return config