ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-06 18:33:13 +03:00
Code Issues Projects Releases Wiki Activity

Made sure to handle an empty journal dir in the config

Browse Source
This commit is contained in:
A_D 2020-12-24 14:31:46 +02:00 committed by Athanasius
parent 1b7ad1f7e9
commit e3def21683
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EDMC.py
View File

@ -190,6 +190,9 @@ sys.path: {sys.path}'''
logger.debug('Getting state from latest journal file') logger.debug('Getting state from latest journal file')
try: try:
logdir = config.get_str('journaldir', default=str(config.default_journal_dir)) logdir = config.get_str('journaldir', default=str(config.default_journal_dir))
if not logdir:
logdir = str(config.default_journal_dir)
logger.debug(f'logdir = "{logdir}"') logger.debug(f'logdir = "{logdir}"')
logfiles = sorted((x for x in os.listdir(logdir) if JOURNAL_RE.search(x)), logfiles = sorted((x for x in os.listdir(logdir) if JOURNAL_RE.search(x)),
key=lambda x: x.split('.')[1:]) key=lambda x: x.split('.')[1:])

3
dashboard.py
View File

@ -42,6 +42,9 @@ class Dashboard(FileSystemEventHandler):
self.session_start = started self.session_start = started
logdir = config.get_str('journaldir', default=str(config.default_journal_dir)) logdir = config.get_str('journaldir', default=str(config.default_journal_dir))
if logdir == '':
logdir = str(config.default_journal_dir)
if not logdir or not isdir(logdir): if not logdir or not isdir(logdir):
logger.info(f"No logdir, or it isn't a directory: {logdir=}") logger.info(f"No logdir, or it isn't a directory: {logdir=}")
self.stop() self.stop()