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

Merge pull request #3069 from alphagov/add-request-id-if-in-context

Browse Source 
Pass request_id onto the task if called from a task
This commit is contained in:
Rebecca Law
2020-12-23 12:26:04 +00:00
committed by GitHub
parent 7152ac7cba a1b31a6c20
commit a2bb775b6f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/celery/celery.py
View File

@@ -1,10 +1,9 @@
import time import time
from gds_metrics.metrics import Histogram from gds_metrics.metrics import Histogram
from celery import Celery, Task from celery import Celery, Task
from celery.signals import worker_process_shutdown from celery.signals import worker_process_shutdown
from flask import g, request from flask import g, request
from flask.ctx import has_request_context from flask.ctx import has_request_context, has_app_context
@worker_process_shutdown.connect @worker_process_shutdown.connect
@@ -55,9 +54,10 @@ def make_task(app):
def apply_async(self, args=None, kwargs=None, task_id=None, producer=None, def apply_async(self, args=None, kwargs=None, task_id=None, producer=None,
link=None, link_error=None, **options): link=None, link_error=None, **options):
kwargs = kwargs or {} kwargs = kwargs or {}
if has_request_context() and hasattr(request, 'request_id'): if has_request_context() and hasattr(request, 'request_id'):
kwargs['request_id'] = request.request_id kwargs['request_id'] = request.request_id
elif has_app_context() and 'request_id' in g:
kwargs['request_id'] = g.request_id
with SQS_APPLY_ASYNC_DURATION_SECONDS.labels(self.name).time(): with SQS_APPLY_ASYNC_DURATION_SECONDS.labels(self.name).time():
return super().apply_async(args, kwargs, task_id, producer, link, link_error, **options) return super().apply_async(args, kwargs, task_id, producer, link, link_error, **options)