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

Simplify argument passing in apply_async

Browse Source 
This avoids the need to keep in-sync with any future changes to the
signature, and reduces the amount of irrelevant code to read.
This commit is contained in:
Ben Thorner
2021-04-13 14:49:15 +01:00
parent 2e6d761691
commit ec6d87cd0f
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/celery/celery.py
View File

@@ -73,16 +73,15 @@ def make_task(app, statsd_client):
return super().__call__(*args, **kwargs)
def apply_async(self, args=None, kwargs=None, task_id=None, producer=None,
link=None, link_error=None, **options):
kwargs = kwargs or {}
def apply_async(self, *args, **kwargs):
kwargs['kwargs'] = kwargs.get('kwargs', {})
if has_request_context() and hasattr(request, 'request_id'):
kwargs['request_id'] = request.request_id
kwargs['kwargs']['request_id'] = request.request_id
elif has_app_context() and 'request_id' in g:
kwargs['request_id'] = g.request_id
kwargs['kwargs']['request_id'] = g.request_id
return super().apply_async(args, kwargs, task_id, producer, link, link_error, **options)
return super().apply_async(*args, **kwargs)
return NotifyTask

19
tests/app/celery/test_celery.py
View File

@@ -89,15 +89,7 @@ def test_apply_async_injects_global_request_id_into_kwargs(mocker, celery_task):
super_apply = mocker.patch('celery.app.task.Task.apply_async')
g.request_id = '1234'
celery_task.apply_async()
super_apply.assert_called_with(
None,
{'request_id': '1234'},
None,
None,
None,
None
)
super_apply.assert_called_with(kwargs={'request_id': '1234'})
def test_apply_async_injects_id_into_kwargs_from_request(mocker, notify_api, celery_task):
@@ -108,11 +100,4 @@ def test_apply_async_injects_id_into_kwargs_from_request(mocker, notify_api, cel
with notify_api.test_request_context(headers=request_headers):
celery_task.apply_async()
super_apply.assert_called_with(
None,
{'request_id': '1234'},
None,
None,
None,
None
)
super_apply.assert_called_with(kwargs={'request_id': '1234'})