chore: refactor try-except blocks into contextmgr

untitaker · untitaker · commit eb81676a2629 · 2018-07-27T05:19:00.000+02:00
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
@@ -10,6 +10,14 @@
 _local = ContextVar("sentry_current_hub")
 
 
+@contextmanager
+def _internal_exceptions():
+    try:
+        yield
+    except Exception:
+        Hub.current.capture_exception()
+
+
 class HubMeta(type):
     @property
     def current(self):
diff --git a/sentry_sdk/integrations/celery.py b/sentry_sdk/integrations/celery.py
@@ -5,6 +5,7 @@
 from celery.signals import task_failure, task_prerun, task_postrun
 
 from sentry_sdk import get_current_hub, configure_scope, capture_exception
+from sentry_sdk.hub import _internal_exceptions
 
 
 _installer_lock = Lock()
@@ -32,13 +33,11 @@ def _process_failure_signal(sender, task_id, einfo, **kw):
 
 
 def _handle_task_prerun(sender, task, **kw):
-    try:
+    with _internal_exceptions():
         get_current_hub().push_scope()
 
         with configure_scope() as scope:
             scope.transaction = task.name
-    except Exception:
-        get_current_hub().capture_internal_exception()
 
 
 def _handle_task_postrun(sender, task_id, task, **kw):
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
@@ -11,6 +11,7 @@
     from django.core.urlresolvers import resolve
 
 from sentry_sdk import get_current_hub, configure_scope, capture_exception
+from sentry_sdk.hub import _internal_exceptions
 from .._wsgi import RequestExtractor
 
 
@@ -31,7 +32,7 @@ def _get_transaction_from_request(request):
 # not yet available
 class SentryMiddleware(MiddlewareMixin):
     def process_request(self, request):
-        try:
+        with _internal_exceptions():
             get_current_hub().push_scope()
 
             get_current_hub().add_event_processor(
@@ -40,15 +41,11 @@ def process_request(self, request):
 
             with configure_scope() as scope:
                 scope.transaction = _get_transaction_from_request(request)
-        except Exception:
-            get_current_hub().capture_internal_exception()
 
     def make_event_processor(self, request):
         def processor(event):
-            try:
+            with _internal_exceptions():
                 DjangoRequestExtractor(request).extract_into_event(event)
-            except Exception:
-                get_current_hub().capture_internal_exception()
 
             # TODO: user info
 
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
@@ -3,6 +3,7 @@
 from threading import Lock
 
 from sentry_sdk import capture_exception, get_current_hub
+from sentry_sdk.hub import _internal_exceptions
 from ._wsgi import RequestExtractor
 
 try:
@@ -51,20 +52,14 @@ def _capture_exception(sender, exception, **kwargs):
 def _event_processor(event):
     if request:
         if "transaction" not in event:
-            try:
+            with _internal_exceptions():
                 event["transaction"] = request.url_rule.endpoint
-            except Exception:
-                get_current_hub().capture_internal_exception()
 
-        try:
+        with _internal_exceptions():
             FlaskRequestExtractor(request).extract_into_event(event)
-        except Exception:
-            get_current_hub().capture_internal_exception()
 
-    try:
+    with _internal_exceptions():
         _set_user_info(event)
-    except Exception:
-        get_current_hub().capture_internal_exception()
 
 
 class FlaskRequestExtractor(RequestExtractor):
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
@@ -7,6 +7,7 @@
 
 from sentry_sdk import get_current_hub, capture_event, add_breadcrumb
 from sentry_sdk.utils import to_string, Event, skip_internal_frames
+from sentry_sdk.hub import _internal_exceptions
 
 
 _installer_lock = Lock()
@@ -37,11 +38,9 @@ def sentry_patched_callhandlers(self, record):
 
 class SentryHandler(logging.Handler, object):
     def emit(self, record):
-        try:
+        with _internal_exceptions():
             self.format(record)
             return self._emit(record)
-        except Exception:
-            get_current_hub().capture_internal_exception()
 
     def can_record(self, record):
         return not record.name.startswith("sentry_sdk")
