Skip to content
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

Jump to bottom

Allow customization of log message #30

Merged
merged 1 commit into from
Nov 4, 2019
Merged

Allow customization of log message #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 10 additions & 12 deletions log_request_id/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,20 @@


class RequestIDMiddleware(MiddlewareMixin):

def process_request(self, request):
request_id = self._get_request_id(request)
local.request_id = request_id
request.id = request_id

def get_log_message(self, request, response):
user = getattr(request, 'user', None)
user_id = getattr(user, 'pk', None) or getattr(user, 'id', None)
message = 'method=%s path=%s status=%s' % (request.method, request.path, response.status_code)
if user_id:
message += ' user=' + str(user_id)
return message


def process_response(self, request, response):
if getattr(settings, REQUEST_ID_RESPONSE_HEADER_SETTING, False) and getattr(request, 'id', None):
response[getattr(settings, REQUEST_ID_RESPONSE_HEADER_SETTING)] = request.id
Expand All @@ -31,18 +39,8 @@ def process_response(self, request, response):
if 'favicon' in request.path:
return response

user = getattr(request, 'user', None)
user_id = getattr(user, 'pk', None) or getattr(user, 'id', None)

message = 'method=%s path=%s status=%s'
args = (request.method, request.path, response.status_code)

if user_id:
message += ' user=%s'
args += (user_id,)
logger.info(self.get_log_message(request, response))

logger.info(message, *args)

try:
del local.request_id
except AttributeError:
Expand Down