diff --git a/app/celery/nightly_tasks.py b/app/celery/nightly_tasks.py index 080445df1..ca48955f0 100644 --- a/app/celery/nightly_tasks.py +++ b/app/celery/nightly_tasks.py @@ -62,6 +62,14 @@ def _remove_csv_files(job_types): current_app.logger.info("Job ID {} has been removed from s3.".format(job.id)) +@notify_celery.task(name="delete-notifications-older-than-retention") +@statsd(namespace="tasks") +def delete_notifications_older_than_retention(): + delete_email_notifications_older_than_retention() + delete_sms_notifications_older_than_retention() + delete_letter_notifications_older_than_retention() + + @notify_celery.task(name="delete-sms-notifications") @cronitor("delete-sms-notifications") @statsd(namespace="tasks") diff --git a/app/config.py b/app/config.py index 7dba73014..f31bf49e6 100644 --- a/app/config.py +++ b/app/config.py @@ -238,27 +238,16 @@ class Config(object): 'schedule': crontab(hour=0, minute=30), # after 'timeout-sending-notifications' 'options': {'queue': QueueNames.REPORTING} }, - 'delete-sms-notifications': { - 'task': 'delete-sms-notifications', + 'delete-notifications-older-than-retention': { + 'task': 'delete-notifications-older-than-retention', 'schedule': crontab(hour=4, minute=15), # after 'create-nightly-notification-status' 'options': {'queue': QueueNames.PERIODIC} }, - 'delete-email-notifications': { - 'task': 'delete-email-notifications', - 'schedule': crontab(hour=4, minute=30), # after 'create-nightly-notification-status' - 'options': {'queue': QueueNames.PERIODIC} - }, - 'delete-letter-notifications': { - 'task': 'delete-letter-notifications', - 'schedule': crontab(hour=4, minute=45), # after 'create-nightly-notification-status' - 'options': {'queue': QueueNames.PERIODIC} - }, 'delete-inbound-sms': { 'task': 'delete-inbound-sms', 'schedule': crontab(hour=1, minute=40), 'options': {'queue': QueueNames.PERIODIC} }, - 'send-daily-performance-platform-stats': { 'task': 'send-daily-performance-platform-stats', 'schedule': crontab(hour=2, minute=0),