Merge pull request #1033 from getsentry/fix/recursion

Fix import locking to avoid recursion (fixes GH-1032)

1 files changed, 15 insertions, 11 deletions

diff --git a/raven/contrib/django/models.py b/raven/contrib/django/models.py
index 4772e10..08caa67 100644
--- a/raven/contrib/django/models.py
+++ b/raven/contrib/django/models.py
@@ -245,15 +245,19 @@ def initialize():
         if _initialized:
             return
 
-        register_serializers()
-        install_middleware()
-
-        # XXX(dcramer): maybe this setting should disable ALL of this?
-        if not getattr(settings, 'DISABLE_SENTRY_INSTRUMENTATION', False):
-            handler = SentryDjangoHandler()
-            handler.install()
-
-        # instantiate client so hooks get registered
-        get_client()  # NOQA
-
+        # mark this as initialized immediatley to avoid recursive import issues
         _initialized = True
+
+        try:
+            register_serializers()
+            install_middleware()
+
+            # XXX(dcramer): maybe this setting should disable ALL of this?
+            if not getattr(settings, 'DISABLE_SENTRY_INSTRUMENTATION', False):
+                handler = SentryDjangoHandler()
+                handler.install()
+
+            # instantiate client so hooks get registered
+            get_client()  # NOQA
+        except Exception:
+            _initialized = False