Thanks to visit codestin.com
Credit goes to github.com

Skip to content

potential deadlock? #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sebdiem wants to merge 3 commits into
base: master
Choose a base branch
from
Open

potential deadlock? #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cb6107
rename functions for consistency
sebdiem Jul 23, 2024
cb81745
add one test proving deadlock
sebdiem Jul 23, 2024
26442d7
remove risk of deadlock in close function
sebdiem Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions logdna/logdna.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,18 @@ def buffer_log_sync(self, message):
self._lock.release()

def flush(self):
self.schedule_flush_sync()

def schedule_flush_sync(self, should_block=False):
should_block = False
if self.request_thread_pool:
try:
self.request_thread_pool.submit(
self.try_lock_and_do_flush_request, should_block)
self.flush_sync, should_block)
except RuntimeError:
self.try_lock_and_do_flush_request(should_block)
self.flush_sync(should_block)
except Exception as e:
self.internalLogger.debug(
'Error in calling try_lock_and_do_flush_request: %s', e)

def try_lock_and_do_flush_request(self, should_block=False):
def flush_sync(self, should_block=False):
local_buf = []
if self._lock.acquire(blocking=should_block):
if not self.buf:
Expand Down Expand Up @@ -337,19 +335,19 @@ def close(self):
self.worker_thread_pool.shutdown(wait=True)
self.worker_thread_pool = None

# Manually force a flush of any remaining log messages in the buffer.
# Shut down the thread pool that was used to send the log messages to
# the server. We can assume at this point that all log messages that
# were in the buffer prior to the worker threads shutting down have
# been sent to the server.
if self.request_thread_pool:
self.request_thread_pool.shutdown(wait=True)
self.request_thread_pool = None

# Finally force a flush of any remaining log messages in the buffer.
# We block here to ensure that the flush completes prior to the
# application exiting and because the probability of this
# introducing a noticeable delay is very low because close() is only
# called when the logger and application are shutting down.
self.schedule_flush_sync(should_block=True)

# Finally, shut down the thread pool that was used to send the log
# messages to the server. We can assume at this point that all log
# messages that were in the buffer prior to the worker threads
# shutting down have been sent to the server.
if self.request_thread_pool:
self.request_thread_pool.shutdown(wait=True)
self.request_thread_pool = None
self.flush_sync(should_block=True)

logging.Handler.close(self)
Loading