From 46044c7c2304dde571544cbcab6d4df9092d7548 Mon Sep 17 00:00:00 2001 From: Mark Murnane Date: Wed, 17 May 2023 17:15:02 -0400 Subject: [PATCH] Only storing ping results --- uber/site_sections/devtools.py | 16 ++++++++-------- uber/tasks/__init__.py | 3 ++- uber/tasks/health.py | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/uber/site_sections/devtools.py b/uber/site_sections/devtools.py index e2201350c..c7410327a 100644 --- a/uber/site_sections/devtools.py +++ b/uber/site_sections/devtools.py @@ -218,10 +218,10 @@ def health(self, session): session.execute(text('SELECT 1')) db_read_time += time.perf_counter() - #payload = random.randrange(1024) - #task_run_time = -time.perf_counter() - #response = ping.delay(payload).wait() - #task_run_time += time.perf_counter() + payload = random.randrange(1024) + task_run_time = -time.perf_counter() + response = ping.delay(payload).wait() + task_run_time += time.perf_counter() return json.dumps({ 'server_current_timestamp': int(datetime.utcnow().timestamp()), @@ -229,10 +229,10 @@ def health(self, session): 'session_commit_time': session_commit_time, 'db_read_time': db_read_time, 'db_status': Session.engine.pool.status(), - # 'task_run_time': task_run_time, - # 'task_response_correct': payload == response, - # 'task_payload': payload, - # 'task_response': response, + 'task_run_time': task_run_time, + 'task_response_correct': payload == response, + 'task_payload': payload, + 'task_response': response, }) @register_diagnostics_status_function diff --git a/uber/tasks/__init__.py b/uber/tasks/__init__.py index 46cb218ab..6a4065bef 100644 --- a/uber/tasks/__init__.py +++ b/uber/tasks/__init__.py @@ -13,7 +13,8 @@ celery.conf.beat_startup_tasks = [] celery.conf.update(config_dict['celery']) celery.conf.update(broker_url=config_dict['secret']['broker_url']) -celery.conf.update(result_backend="rpc") +celery.conf.update(result_backend=config_dict['secret']['broker_url'].replace("amqp://", "rpc://")) +celery.conf.update(task_ignore_result=True) def celery_on_startup(fn, *args, **kwargs): celery.conf.beat_startup_tasks.append((celery.task(fn), args, kwargs)) diff --git a/uber/tasks/health.py b/uber/tasks/health.py index 3d55aa518..08485b72b 100644 --- a/uber/tasks/health.py +++ b/uber/tasks/health.py @@ -2,7 +2,7 @@ from uber.models import Session from sqlalchemy import text -@celery.task +@celery.task(ignore_result=False) def ping(response): with Session() as session: session.execute(text('SELECT 1'))