Correctly handle (and test) request in Django logging handler

CHANGES

@@ -1,3 +1,7 @@
+1.1.3
+
+* Fix 'request' attribute on Django logging.
+
 1.1.2
 
 * Corrected logging behavior with extra data to match pre 1.x behavior.

raven/contrib/django/handlers.py

@@ -9,9 +9,12 @@
 from __future__ import absolute_import
 
 import logging
-from raven.handlers.logging import SentryHandler
+from raven.handlers.logging import SentryHandler as BaseSentryHandler
+
+
+class SentryHandler(BaseSentryHandler):
+    reserved = BaseSentryHandler.reserved + ['request']
 
-class SentryHandler(SentryHandler):
     def __init__(self):
         logging.Handler.__init__(self)
 

setup.py

@@ -31,7 +31,7 @@
 
 setup(
     name='raven',
-    version='1.1.2',
+    version='1.1.3',
     author='David Cramer',
     author_email='[email protected]',
     url='http://github.com/dcramer/raven',

tests/contrib/django/tests.py

@@ -25,16 +25,19 @@
 
 settings.SENTRY_CLIENT = 'tests.contrib.django.tests.TempStoreClient'
 
+
 class MockClientHandler(TestClientHandler):
     def __call__(self, environ, start_response=[]):
         # this pretends doesnt require start_response
         return super(MockClientHandler, self).__call__(environ)
 
+
 class MockSentryMiddleware(Sentry):
     def __call__(self, environ, start_response=[]):
         # this pretends doesnt require start_response
         return list(super(MockSentryMiddleware, self).__call__(environ, start_response))
 
+
 class TempStoreClient(DjangoClient):
     def __init__(self, *args, **kwargs):
         self.events = []
@@ -43,6 +46,7 @@ def __init__(self, *args, **kwargs):
     def send(self, **kwargs):
         self.events.append(kwargs)
 
+
 class Settings(object):
     """
     Allows you to define settings that are required for this function to work.
@@ -69,6 +73,7 @@ def __exit__(self, exc_type, exc_value, traceback):
             else:
                 setattr(settings, k, v)
 
+
 class DjangoClientTest(TestCase):
     ## Fixture setup/teardown
     urls = 'tests.contrib.django.urls'
@@ -365,6 +370,36 @@ def test_request_capture(self):
         self.assertEquals(env['SERVER_PORT'], '80')
 
 
+class DjangoLoggingTest(TestCase):
+    def setUp(self):
+        self.logger = logging.getLogger(__name__)
+        self.raven = get_client()
+
+    def test_request_kwarg(self):
+        handler = SentryHandler()
+
+        logger = self.logger
+        logger.handlers = []
+        logger.addHandler(handler)
+
+        logger.error('This is a test error', extra={
+            'request': WSGIRequest(environ={
+                'wsgi.input': StringIO(),
+                'REQUEST_METHOD': 'POST',
+                'SERVER_NAME': 'testserver',
+                'SERVER_PORT': '80',
+                'CONTENT_TYPE': 'application/octet-stream',
+                'ACCEPT': 'application/json',
+            })
+        })
+
+        self.assertEquals(len(self.raven.events), 1)
+        event = self.raven.events.pop(0)
+        self.assertTrue('sentry.interfaces.Http' in event)
+        http = event['sentry.interfaces.Http']
+        self.assertEquals(http['method'], 'POST')
+
+
 class IsolatedCeleryClientTest(TestCase):
     def setUp(self):
         self.client = make_celery_client(TempStoreClient())