darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 07:35:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3364 from alphagov/celery-headers-request-id-180213914

Browse Source 
Move Celery task Request ID injection into headers
This commit is contained in:
Ben Thorner
2021-11-12 11:10:29 +00:00
committed by GitHub
parent 4a577eca62 89a8dd1a03
commit d66c68d6d6
2 changed files with 70 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/celery/celery.py
View File

@@ -68,9 +68,12 @@ def make_task(app):
# ensure task has flask context to access config, logger, etc
with app.app_context():
self.start = time.monotonic()
# Remove piggyback values from kwargs
# Add 'request_id' to 'g' so that it gets logged
g.request_id = kwargs.pop('request_id', None)
# TEMPORARY: remove old piggyback values from kwargs
kwargs.pop('request_id', None)
# Add 'request_id' to 'g' so that it gets logged. Note
# that each header is a direct attribute of the task
# context (aka "request").
g.request_id = self.request.get('notify_request_id')
return super().__call__(*args, **kwargs)
@@ -90,11 +93,11 @@ class NotifyCelery(Celery):
self._app = app
def send_task(self, name, args=None, kwargs=None, **other_kwargs):
kwargs = kwargs or {}
other_kwargs['headers'] = other_kwargs.get('headers') or {}
if has_request_context() and hasattr(request, 'request_id'):
kwargs['request_id'] = request.request_id
other_kwargs['headers']['notify_request_id'] = request.request_id
elif has_app_context() and 'request_id' in g:
kwargs['request_id'] = g.request_id
other_kwargs['headers']['notify_request_id'] = g.request_id
return super().send_task(name, args, kwargs, **other_kwargs)