diff --git a/rowers/management/commands/processalerts.py b/rowers/management/commands/processalerts.py index a2180efd..b9efe371 100644 --- a/rowers/management/commands/processalerts.py +++ b/rowers/management/commands/processalerts.py @@ -11,6 +11,9 @@ from rowers.tasks import handle_send_email_alert from rowers import alerts +from rowers.utils import myqueue + + import django_rq queue = django_rq.get_queue('default') queuelow = django_rq.get_queue('low') @@ -35,20 +38,21 @@ class Command(BaseCommand): else: testing = False - todaysalerts = Alert.objects.filter(next_run = datetime.date.today(),emailalert=True) + todaysalerts = Alert.objects.filter(next_run <= datetime.date.today(),emailalert=True) for alert in todaysalerts: stats = alerts.alert_get_stats(alert) # send email - handle_send_email_alert(alert.manager.email, - alert.manager.first_name, - alert.manager.last_name, - stats,debug=True) + job = myqueue(queue,handle_send_email_alert, + alert.manager.email, + alert.manager.first_name, + alert.manager.last_name, + stats,debug=True) # advance next_run if not testing: - alert.next_run = alert.next_run + datetime.timedelta(days=alert.period) + alert.next_run = datetime.date.today() + datetime.timedelta(days=alert.period) alert.save() if testing: