Skip to content

Use main thread for sending pending events on shutdown #2481

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.

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

Closed
Changes from all commits
Commits
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
24 changes: 20 additions & 4 deletions sentry_sdk/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,13 @@ def start(self):
self._thread.daemon = True
try:
self._thread.start()
self._thread_for_pid = os.getpid()
except RuntimeError:
# At this point we can no longer start because the interpreter
# is already shutting down. Sadly at this point we can no longer
# send out events.
self._thread = None
# is already shutting down. Let's use the main thread for
# sending pending events instead.
self._thread = self._get_main_thread()

self._thread_for_pid = os.getpid()

def kill(self):
# type: () -> None
Expand Down Expand Up @@ -141,3 +142,18 @@ def _target(self):
finally:
self._queue.task_done()
sleep(0)

def _get_main_thread(self):
# type: () -> Optional[threading.Thread]
main_thread = None

try:
main_thread = threading.main_thread()
except AttributeError:
# Python 2.7 doesn't have threading.main_thread()
for thread in threading.enumerate():
if isinstance(thread, threading._MainThread): # type: ignore[attr-defined]
main_thread = thread
break

return main_thread