Skip to content

fix: Make flush thread a daemon thread to prevent shutdown hang #102

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

Merged
shawkinsmezmo merged 1 commit into from
Jul 21, 2023
Merged

fix: Make flush thread a daemon thread to prevent shutdown hang #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions logdna/logdna.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ def __init__(self, key, options={}):

# Start the flusher
self.flusher_stopped = threading.Event()
self.flusher = threading.Timer(
self.flush_interval_secs, self.flush_timer_worker)
self.flusher = threading.Thread(
target=self.flush_timer_worker, daemon=True)
self.flusher.start()

def flush_timer_worker(self):
Expand All @@ -93,7 +93,7 @@ def flush_timer_worker(self):
def close_flusher(self):
if self.flusher:
self.flusher_stopped.set()
self.flusher.cancel()
self.flusher.join()
self.flusher = None

def buffer_log(self, message):
Expand Down
5 changes: 5 additions & 0 deletions tests/test_logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,11 @@ def get_sample_record(id):
self.assertEqual(len(received), num_logs)
self.assertEquals(set(received), set(range(num_logs)))

def test_when_handlerShutDown_then_handlerDoesNotHang(self):
handler = LogDNAHandler(LOGDNA_API_KEY, sample_options)
self.assertIsNotNone(handler)
# Do nothing. This test should pass by virtue of not hanging.


if __name__ == '__main__':
unittest.main()