core: log filenames of read config files

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

View file

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

View file

@ -99,13 +99,22 @@ def fixLocalDir(silent=True):
fixConfigOption("", "local_dir", old_default, silent)
def parseMainConf():
"""look for main .ini configuration file, and parse it"""
def parseMainConf(log_filenames=False):
"""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)
try:
config.read(C.CONFIG_FILES)
filenames = config.read(C.CONFIG_FILES)
except Exception as e:
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