From 59570fdc0a521551fd04d32a8cdce297517e73fb Mon Sep 17 00:00:00 2001 From: Daniel Scheffler Date: Wed, 25 Nov 2020 22:06:45 +0100 Subject: [PATCH] Fixed missing log messages regarding released locks. Signed-off-by: Daniel Scheffler --- HISTORY.rst | 6 ++++++ gms_preprocessing/misc/locks.py | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 2165589..06427a4 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,12 @@ History ======= +0.18.12 (coming soon) +--------------------- + +* Fixed missing log messages regarding released locks. + + 0.18.11 (2020-11-03) -------------------- diff --git a/gms_preprocessing/misc/locks.py b/gms_preprocessing/misc/locks.py index 82b28de..cbf0120 100644 --- a/gms_preprocessing/misc/locks.py +++ b/gms_preprocessing/misc/locks.py @@ -96,8 +96,9 @@ class MultiSlotLock(Semaphore): self.client.delete(self.grabbed_key) def __exit__(self, exc_type, exc_val, exc_tb): + exitcode = super(MultiSlotLock, self).__exit__(exc_type, exc_val, exc_tb) self.logger.close() - return super(MultiSlotLock, self).__exit__(exc_type, exc_val, exc_tb) + return exitcode class SharedResourceLock(MultiSlotLock): @@ -134,7 +135,6 @@ class SharedResourceLock(MultiSlotLock): self.client.delete(self.grabbed_key_jobID) def __exit__(self, exc_type, exc_val, exc_tb): - self.logger.close() return super(SharedResourceLock, self).__exit__(exc_type, exc_val, exc_tb) @@ -146,7 +146,6 @@ class IOLock(SharedResourceLock): super(IOLock, self).__init__(name='IOLock', allowed_slots=allowed_slots, logger=logger, **kwargs) def __exit__(self, exc_type, exc_val, exc_tb): - self.logger.close() return super(IOLock, self).__exit__(exc_type, exc_val, exc_tb) @@ -158,7 +157,6 @@ class ProcessLock(SharedResourceLock): super(ProcessLock, self).__init__(name='ProcessLock', allowed_slots=allowed_slots, logger=logger, **kwargs) def __exit__(self, exc_type, exc_val, exc_tb): - self.logger.close() return super(ProcessLock, self).__exit__(exc_type, exc_val, exc_tb) -- GitLab