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.

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

Jump to bottom

Prevent global var from being discarded at shutdown #2530

Merged
merged 3 commits into from
Nov 24, 2023
Merged

Prevent global var from being discarded at shutdown #2530

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec069ff
Prevent global var from being discarded at shutdown
antonpirker Nov 23, 2023
dfc5673
Merge branch 'master' into antonpirker/local_ignore_loggers
antonpirker Nov 23, 2023
dc5b4e6
Merge branch 'master' into antonpirker/local_ignore_loggers
antonpirker Nov 24, 2023
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: 5 additions & 1 deletion sentry_sdk/integrations/logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,18 @@ def setup_once():

def sentry_patched_callhandlers(self, record):
# type: (Any, LogRecord) -> Any
# keeping a local reference because the
# global might be discarded on shutdown
ignored_loggers = _IGNORED_LOGGERS

try:
return old_callhandlers(self, record)
finally:
# This check is done twice, once also here before we even get
# the integration. Otherwise we have a high chance of getting
# into a recursion error when the integration is resolved
# (this also is slower).
if record.name not in _IGNORED_LOGGERS:
if ignored_loggers is not None and record.name not in ignored_loggers:
integration = Hub.current.get_integration(LoggingIntegration)
if integration is not None:
integration._handle_record(record)
Expand Down
Loading