Django: Save an extra (potential) DB lookup if SENTRY_SITE is set by …

…not looking up django.contrib.sites. Catch any errors looking up the django.contrib.sites model, falling back to settings.SITE_ID.
coddingtonbear · Feb 8, 2013 · fa3b1c8 · fa3b1c8
1 parent bdcb353
commit fa3b1c8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/raven/contrib/django/client.py b/raven/contrib/django/client.py
@@ -82,11 +82,15 @@ def build_msg(self, *args, **kwargs):
                 if frame.get('module', '').startswith('django.'):
                     frame['in_app'] = False
 
-        if 'django.contrib.sites' in settings.INSTALLED_APPS:
-            from django.contrib.sites import models as site_models
-            site = site_models.Site.objects.get_current()
-            site_name = site.name or site.domain
-            data['tags'].setdefault('site', site_name)
+        if (not self.site) and 'django.contrib.sites' in settings.INSTALLED_APPS:
+            try:
+                from django.contrib.sites import models as site_models
+                site = site_models.Site.objects.get_current()
+                site_name = site.name or site.domain
+                data['tags'].setdefault('site', site_name)
+            except:
+                # Database error? Fallback to the id
+                data['tags'].setdefault('site', settings.SITE_ID)
 
         return data
 

diff --git a/tests/contrib/django/tests.py b/tests/contrib/django/tests.py
@@ -434,6 +434,28 @@ def test_adds_site_to_tags(self):
         assert 'site' in event['tags']
         assert tags['site'] == u'example.com'
 
+    def test_adds_site_to_tags_fallback(self):
+        with Settings(SITE_ID=12345):  # nonexistant site, should fallback to SITE_ID
+            self.assertRaises(TemplateSyntaxError, self.client.get, reverse('sentry-template-exc'))
+
+            self.assertEquals(len(self.raven.events), 1)
+            event = self.raven.events.pop(0)
+
+            tags = event['tags']
+            assert 'site' in event['tags']
+            assert tags['site'] == 12345
+
+    def test_settings_site_overrides_contrib(self):
+        self.raven.site = 'FOO'
+        self.assertRaises(TemplateSyntaxError, self.client.get, reverse('sentry-template-exc'))
+
+        self.assertEquals(len(self.raven.events), 1)
+        event = self.raven.events.pop(0)
+
+        tags = event['tags']
+        assert 'site' in event['tags']
+        assert tags['site'] == 'FOO'
+
 
 class DjangoTemplateTagTest(TestCase):
     @mock.patch('raven.contrib.django.DjangoClient.get_public_dsn')