Skip to content

Adds the ability to change the default value of missing request_id #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 17, 2020
Merged

Adds the ability to change the default value of missing request_id #40

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
284a264
Adds the ability to change the default value of missing request_id
kingbuzzman Apr 13, 2020
8e34198
Update session.py
kingbuzzman Apr 16, 2020
fb01ff1
Reworks logic
kingbuzzman Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Reworks logic
  • Loading branch information
@kingbuzzman
kingbuzzman committed Apr 16, 2020
commit fb01ff1cfe656053f3a899442ca114a9c22563b4
10 changes: 4 additions & 6 deletions log_request_id/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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)
4 changes: 1 addition & 3 deletions log_request_id/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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)