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

Merge pull request #3205 from alphagov/celery-consistency-tweaks

Browse Source 
Small refactor for new Celery / StatsD code
This commit is contained in:
Ben Thorner
2021-04-15 11:40:42 +01:00
committed by GitHub
parent bbc2de10de 5eb265138b
commit fde927e00e
3 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/celery/celery.py
View File

@@ -18,7 +18,7 @@ def log_on_worker_shutdown(sender, signal, pid, exitcode, **kwargs):
notify_celery._app.logger.info('worker shutdown: PID: {} Exitcode: {}'.format(pid, exitcode))
def make_task(app, statsd_client):
def make_task(app):
class NotifyTask(Task):
abstract = True
start = None
@@ -36,7 +36,7 @@ def make_task(app, statsd_client):
)
)
statsd_client.timing(
app.statsd_client.timing(
"celery.{queue_name}.{task_name}.success".format(
task_name=self.name,
queue_name=queue_name
@@ -54,7 +54,7 @@ def make_task(app, statsd_client):
)
)
statsd_client.incr(
app.statsd_client.incr(
"celery.{queue_name}.{task_name}.failure".format(
task_name=self.name,
queue_name=queue_name
@@ -73,27 +73,26 @@ 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
class NotifyCelery(Celery):
def init_app(self, app, statsd_client):
def init_app(self, app):
super().__init__(
app.import_name,
broker=app.config['BROKER_URL'],
task_cls=make_task(app, statsd_client),
task_cls=make_task(app),
)
self.conf.update(app.config)