Reworks logic

Author: kingbuzzman

log_request_id/session.py

@@ -2,8 +2,7 @@
 from django.core.exceptions import ImproperlyConfigured
 from requests import Session as BaseSession
 
-from log_request_id import DEFAULT_NO_REQUEST_ID, LOG_REQUESTS_NO_SETTING, OUTGOING_REQUEST_ID_HEADER_SETTING, \
-    REQUEST_ID_HEADER_SETTING, local
+from log_request_id import DEFAULT_NO_REQUEST_ID, OUTGOING_REQUEST_ID_HEADER_SETTING, REQUEST_ID_HEADER_SETTING, local
 
 
 class Session(BaseSession):
@@ -24,10 +23,9 @@ def prepare_request(self, request):
         """Include the request ID, if available, in the outgoing request"""
         try:
             request_id = local.request_id
+            if self.request_id_header:
+                request.headers[self.request_id_header] = request_id
         except AttributeError:
-            request_id = getattr(settings, LOG_REQUESTS_NO_SETTING, DEFAULT_NO_REQUEST_ID)
-
-        if self.request_id_header and request_id != DEFAULT_NO_REQUEST_ID:
-            request.headers[self.request_id_header] = request_id
+            pass
 
         return super(Session, self).prepare_request(request)

log_request_id/tests.py

@@ -5,6 +5,7 @@
 from requests import Request
 
 from log_request_id import DEFAULT_NO_REQUEST_ID, local
+from log_request_id.session import Session
 from log_request_id.middleware import RequestIDMiddleware
 from testproject.views import test_view
 
@@ -101,7 +102,6 @@ def setUp(self):
 
     def test_request_id_passthrough_with_custom_header(self):
         with self.settings(LOG_REQUEST_ID_HEADER='REQUEST_ID_HEADER', OUTGOING_REQUEST_ID_HEADER='OUTGOING_REQUEST_ID_HEADER'):
-            from log_request_id.session import Session
             request = self.factory.get('/')
             request.META['REQUEST_ID_HEADER'] = 'some_request_id'
             middleware = RequestIDMiddleware()
@@ -117,7 +117,6 @@ def test_request_id_passthrough_with_custom_header(self):
 
     def test_request_id_passthrough(self):
         with self.settings(LOG_REQUEST_ID_HEADER='REQUEST_ID_HEADER'):
-            from log_request_id.session import Session
             request = self.factory.get('/')
             request.META['REQUEST_ID_HEADER'] = 'some_request_id'
             middleware = RequestIDMiddleware()
@@ -133,6 +132,5 @@ def test_request_id_passthrough(self):
 
     def test_misconfigured_for_sessions(self):
         def inner():
-            from log_request_id.session import Session  # noqa
             Session()
         self.assertRaises(ImproperlyConfigured, inner)