ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-21 11:27:38 +03:00
Code Issues Projects Releases Wiki Activity

Log truncate outside the 'else' & misc logging cleanups and comments

Browse Source 
* The "truncate the stdout redirect" code was erroneously inside the
  else of a try.
* Added some comments about exceptions found on Linux when unable to
  open the journals_dir lock file
* Changed 'assuming another process running' logging to not split lines.
* "Couldn't open <journal lock file>" isn't inside no_other_instances()
  so made the message more obvious.
This commit is contained in:
Athanasius 2021-01-19 12:39:32 +00:00
parent 45619622af
commit 479bfe58eb
1 changed files with 8 additions and 6 deletions

14
EDMarketConnector.py

@ -84,7 +84,7 @@ if __name__ == '__main__': # noqa: C901
except Exception as e:
logger.info(f"Exception: Couldn't lock journal directory \"{journal_dir}\""
f", assuming another process running\n{e!r}")
f", assuming another process running: {e!r}")
locked = True
if locked:
@ -183,7 +183,7 @@ if __name__ == '__main__': # noqa: C901
except Exception as e:
logger.info(f"Exception: Couldn't lock journal directory \"{journal_dir}\","
f"assuming another process running\n{e!r}")
f"assuming another process running: {e!r}")
return False
journal_dir_lockfile.write(f"Path: {journal_dir}\nPID: {os_getpid()}\n")
@ -221,9 +221,11 @@ if __name__ == '__main__': # noqa: C901
try:
journal_dir_lockfile = open(journal_dir_lockfile_name, mode='w+', encoding='utf-8')
# Linux CIFS read-only mount throws: OSError(30, 'Read-only file system')
# Linux no-write-perm directory throws: PermissionError(13, 'Permission denied')
except Exception as e: # For remote FS this could be any of a wide range of exceptions
logger.warning(f"Couldn't open \"{journal_dir_lockfile_name}\" for \"w+\""
f"Aborting checks: {e!r}")
f" Aborting duplicate process checks: {e!r}")
else:
if not no_other_instance_running():
@ -237,9 +239,9 @@ if __name__ == '__main__': # noqa: C901
# reach here.
sys.exit(0)
if getattr(sys, 'frozen', False):
# Now that we're sure we're the only instance running we can truncate the logfile
sys.stdout.truncate()
if getattr(sys, 'frozen', False):
# Now that we're sure we're the only instance running we can truncate the logfile
sys.stdout.truncate()
# See EDMCLogging.py docs.