darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-22 00:11:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Delete job statistics tasks

Browse Source 
The tasks are no longer being used, so can be deleted safely:
* record_initial_job_statistics
* record_outcome_job_statistics
* timeout-job-statistics

The test file for the statistics tasks was deleted in a previous commit.
This commit is contained in:
Katie Smith
2018-03-05 15:59:58 +00:00
parent 40a0b8f03c
commit 4f7dd1d258
3 changed files with 0 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/celery/scheduled_tasks.py
View File

@@ -39,7 +39,6 @@ from app.dao.notifications_dao import (
dao_get_scheduled_notifications, dao_get_scheduled_notifications,
set_scheduled_notification_to_processed, set_scheduled_notification_to_processed,
) )
from app.dao.statistics_dao import dao_timeout_job_statistics
from app.dao.provider_details_dao import ( from app.dao.provider_details_dao import (
get_current_provider, get_current_provider,
dao_toggle_sms_provider dao_toggle_sms_provider
@@ -282,15 +281,6 @@ def switch_current_sms_provider_on_slow_delivery():
dao_toggle_sms_provider(current_provider.identifier) dao_toggle_sms_provider(current_provider.identifier)
@notify_celery.task(name='timeout-job-statistics')
@statsd(namespace="tasks")
def timeout_job_statistics():
updated = dao_timeout_job_statistics(current_app.config.get('SENDING_NOTIFICATIONS_TIMEOUT_PERIOD'))
if updated:
current_app.logger.info(
"Timeout period reached for {} job statistics, failure count has been updated.".format(updated))
@notify_celery.task(name="delete-inbound-sms") @notify_celery.task(name="delete-inbound-sms")
@statsd(namespace="tasks") @statsd(namespace="tasks")
def delete_inbound_sms_older_than_seven_days(): def delete_inbound_sms_older_than_seven_days():

62
app/celery/statistics_tasks.py
View File

@@ -1,62 +0,0 @@
from celery.signals import worker_process_shutdown
from notifications_utils.statsd_decorators import statsd
from sqlalchemy.exc import SQLAlchemyError
from app import notify_celery
from flask import current_app
from app.dao.statistics_dao import (
create_or_update_job_sending_statistics,
update_job_stats_outcome_count
)
from app.dao.notifications_dao import get_notification_by_id
from app.config import QueueNames
@worker_process_shutdown.connect
def worker_process_shutdown(sender, signal, pid, exitcode):
current_app.logger.info('Statistics worker shutdown: PID: {} Exitcode: {}'.format(pid, exitcode))
@notify_celery.task(bind=True, name='record_initial_job_statistics', max_retries=20, default_retry_delay=10)
@statsd(namespace="tasks")
def record_initial_job_statistics(self, notification_id):
notification = None
try:
notification = get_notification_by_id(notification_id)
if notification:
create_or_update_job_sending_statistics(notification)
else:
raise SQLAlchemyError("Failed to find notification with id {}".format(notification_id))
except SQLAlchemyError as e:
current_app.logger.exception(e)
self.retry(queue=QueueNames.RETRY)
except self.MaxRetriesExceededError:
current_app.logger.error(
"RETRY FAILED: task record_initial_job_statistics failed for notification {}".format(
notification.id if notification else "missing ID"
)
)
@notify_celery.task(bind=True, name='record_outcome_job_statistics', max_retries=20, default_retry_delay=10)
@statsd(namespace="tasks")
def record_outcome_job_statistics(self, notification_id):
notification = None
try:
notification = get_notification_by_id(notification_id)
if notification:
updated_count = update_job_stats_outcome_count(notification)
if updated_count == 0:
self.retry(queue=QueueNames.RETRY)
else:
raise SQLAlchemyError("Failed to find notification with id {}".format(notification_id))
except SQLAlchemyError as e:
current_app.logger.exception(e)
self.retry(queue=QueueNames.RETRY)
except self.MaxRetriesExceededError:
current_app.logger.error(
"RETRY FAILED: task update_job_stats_outcome_count failed for notification {}".format(
notification.id if notification else "missing ID"
)
)

8
tests/app/celery/test_scheduled_tasks.py
View File

@@ -32,7 +32,6 @@ from app.celery.scheduled_tasks import (
send_scheduled_notifications, send_scheduled_notifications,
send_total_sent_notifications_to_performance_platform, send_total_sent_notifications_to_performance_platform,
switch_current_sms_provider_on_slow_delivery, switch_current_sms_provider_on_slow_delivery,
timeout_job_statistics,
timeout_notifications, timeout_notifications,
daily_stats_template_usage_by_month, daily_stats_template_usage_by_month,
letter_raise_alert_if_no_ack_file_for_zip letter_raise_alert_if_no_ack_file_for_zip
@@ -492,13 +491,6 @@ def test_should_send_all_scheduled_notifications_to_deliver_queue(sample_templat
assert not scheduled_notifications assert not scheduled_notifications
def test_timeout_job_statistics_called_with_notification_timeout(notify_api, mocker):
notify_api.config['SENDING_NOTIFICATIONS_TIMEOUT_PERIOD'] = 999
dao_mock = mocker.patch('app.celery.scheduled_tasks.dao_timeout_job_statistics')
timeout_job_statistics()
dao_mock.assert_called_once_with(999)
def test_should_call_delete_inbound_sms_older_than_seven_days(notify_api, mocker): def test_should_call_delete_inbound_sms_older_than_seven_days(notify_api, mocker):
mocker.patch('app.celery.scheduled_tasks.delete_inbound_sms_created_more_than_a_week_ago') mocker.patch('app.celery.scheduled_tasks.delete_inbound_sms_created_more_than_a_week_ago')
delete_inbound_sms_older_than_seven_days() delete_inbound_sms_older_than_seven_days()