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

JournalLock: Tag sub-process locker prints for easy reading

Browse Source
This commit is contained in:
Athanasius 2021-03-24 14:58:42 +00:00 committed by Athanasius
parent 1a1ad86840
commit cda6d344ae
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/journal_lock.py/test_journal_lock.py
View File

@ -47,13 +47,13 @@ def other_process_lock(continue_q: mp.Queue, exit_q: mp.Queue, lockfile: pathlib
:param lockfile: Path where the lockfile should be. :param lockfile: Path where the lockfile should be.
""" """
with open(lockfile / 'edmc-journal-lock.txt', mode='w+') as lf: with open(lockfile / 'edmc-journal-lock.txt', mode='w+') as lf:
print(f'Opened {lockfile} for read...') print(f'sub-process: Opened {lockfile} for read...')
# This needs to be kept in sync with journal_lock.py:_obtain_lock() # This needs to be kept in sync with journal_lock.py:_obtain_lock()
if sys.platform == 'win32': if sys.platform == 'win32':
print('On win32') print('sub-process: On win32')
import msvcrt import msvcrt
try: try:
print('Trying msvcrt.locking() ...') print('sub-process: Trying msvcrt.locking() ...')
msvcrt.locking(lf.fileno(), msvcrt.LK_NBLCK, 4096) msvcrt.locking(lf.fileno(), msvcrt.LK_NBLCK, 4096)
except Exception as e: except Exception as e:
@ -63,17 +63,17 @@ def other_process_lock(continue_q: mp.Queue, exit_q: mp.Queue, lockfile: pathlib
else: else:
import fcntl import fcntl
print('Not win32, using fcntl') print('sub-process: Not win32, using fcntl')
try: try:
fcntl.flock(lf, fcntl.LOCK_EX | fcntl.LOCK_NB) fcntl.flock(lf, fcntl.LOCK_EX | fcntl.LOCK_NB)
except Exception as e: except Exception as e:
print(f'sub-process: Unable to lock file: {e!r}') print(f'sub-process: Unable to lock file: {e!r}')
print('Telling main process to go...') print('sub-process: Got lock, telling main process to go...')
continue_q.put('go', timeout=5) continue_q.put('go', timeout=5)
# Wait for signal to exit # Wait for signal to exit
print('Waiting for exit signal...') print('sub-process: Waiting for exit signal...')
exit_q.get(block=True, timeout=None) exit_q.get(block=True, timeout=None)