From 07aa44ea82ece6935e95eaffe6059d7822b0d237 Mon Sep 17 00:00:00 2001 From: venusbb Date: Tue, 20 Mar 2018 13:53:31 +0000 Subject: [PATCH] Add import report_tasks to schedule_tasks. --- app/celery/reporting_tasks.py | 8 ++++---- app/celery/scheduled_tasks.py | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/celery/reporting_tasks.py b/app/celery/reporting_tasks.py index 37746742b..20aa6c66f 100644 --- a/app/celery/reporting_tasks.py +++ b/app/celery/reporting_tasks.py @@ -1,5 +1,3 @@ -from app import notify_celery -from notifications_utils.statsd_decorators import statsd import random from datetime import datetime, timedelta from app.models import (Notification, @@ -14,6 +12,8 @@ from app.models import (Notification, from app import db from sqlalchemy import func, desc, case from app.dao.dao_utils import transactional +from notifications_utils.statsd_decorators import statsd +from app import notify_celery def get_rate(non_letter_rates, letter_rates, notification_type, date, crown=None, rate_multiplier=None): @@ -26,10 +26,10 @@ def get_rate(non_letter_rates, letter_rates, notification_type, date, crown=None return 0 -@notify_celery.task(bind=True, name="create-nightly-billing", max_retries=15, default_retry_delay=300) +@notify_celery.task(name="create-nightly-billing") @statsd(namespace="tasks") @transactional -def create_nightly_billing(self, day_start=None): +def create_nightly_billing(day_start=None): if day_start is None: day_start = datetime.date(datetime.utcnow()) - timedelta(days=3) # Nightly jobs consolidating last 3 days # Task to be run after mid-night diff --git a/app/celery/scheduled_tasks.py b/app/celery/scheduled_tasks.py index d863dda19..a3494629c 100644 --- a/app/celery/scheduled_tasks.py +++ b/app/celery/scheduled_tasks.py @@ -70,6 +70,7 @@ from app.celery.service_callback_tasks import ( create_encrypted_callback_data, ) import pytz +from app.celery.reporting_tasks import create_nightly_billing # noqa - otherwise task won't start @worker_process_shutdown.connect