Skip to content
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

Wait for events in the queue #24

Merged
merged 4 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
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
9 changes: 8 additions & 1 deletion backtracepython/client.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import atexit
import sys

from backtracepython.attributes.attribute_manager import attribute_manager
Expand Down Expand Up @@ -89,6 +90,7 @@ def initialize(
context_line_count=200,
collect_source_code=True,
disable_global_handler=False,
exit_timeout=4,
):
globs.endpoint = construct_submission_url(endpoint, token)
globs.debug_backtrace = debug_backtrace
Expand All @@ -102,6 +104,7 @@ def initialize(
ignore_ssl_certificate,
globs.debug_backtrace,
),
exit_timeout,
(
SourceCodeHandler(tab_width, context_line_count)
if collect_source_code
Expand All @@ -113,6 +116,9 @@ def initialize(
globs.next_except_hook = sys.excepthook
sys.excepthook = bt_except_hook

if exit_timeout > 0:
atexit.register(finalize)


def construct_submission_url(endpoint, token):
if "submit.backtrace.io" in endpoint or token is None:
Expand All @@ -132,7 +138,8 @@ def construct_submission_url(endpoint, token):
def finalize():
if globs.handler is None:
return
globs.handler.dispose()
globs.handler.finish()
globs.handler = None


def send_last_exception(**kwargs):
Expand Down
13 changes: 5 additions & 8 deletions backtracepython/report_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@


class ReportQueue:
def __init__(self, request_handler, source_code_handler=None):
def __init__(self, request_handler, exit_timeout, source_code_handler=None):
self.request_handler = request_handler
self.source_code_handler = source_code_handler
self.exit_timeout = exit_timeout

# report submission tasks queue
self.report_queue = queue.Queue()
Expand Down Expand Up @@ -41,12 +42,8 @@ def process(self, report, attachments):
self.source_code_handler.collect(report)
self.request_handler.send(report, attachments)

def __del__(self):
self.dispose()

def dispose(self):
def finish(self):
# Put a sentinel value to stop the worker thread
perf2711 marked this conversation as resolved.
Show resolved Hide resolved
self.active = False
self.report_queue.put_nowait(None)
self.report_queue.join()
self.worker_thread.join()
self.worker_thread.join(timeout=self.exit_timeout)
perf2711 marked this conversation as resolved.
Show resolved Hide resolved
self.active = False
Loading