From 8f1d099a9cefa8765978c165a1613526c54dc007 Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Sat, 15 Mar 2014 18:18:55 -0700
Subject: [PATCH] all messages in one job was a terrible idea
---
helios/tasks.py | 12 +-----------
settings.py | 3 ---
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/helios/tasks.py b/helios/tasks.py
index 75318b1..7b30fbb 100644
--- a/helios/tasks.py
+++ b/helios/tasks.py
@@ -53,17 +53,7 @@ def voters_email(election_id, subject_template, body_template, extra_vars={},
voters = voters.exclude(**voter_constraints_exclude)
for voter in voters:
- if settings.QUEUE_INDIVIDUAL_EMAILS:
- single_voter_email.delay(voter.uuid, subject_template, body_template, extra_vars)
- else:
- the_vars = copy.copy(extra_vars)
- the_vars.update({'voter' : voter})
-
- subject = render_template_raw(None, subject_template, the_vars)
- body = render_template_raw(None, body_template, the_vars)
-
- voter.user.send_message(subject, body)
-
+ single_voter_email.delay(voter.uuid, subject_template, body_template, extra_vars)
@task()
def voters_notify(election_id, notification_template, extra_vars={}):
diff --git a/settings.py b/settings.py
index 3314019..5c90c6a 100644
--- a/settings.py
+++ b/settings.py
@@ -155,9 +155,6 @@ DEFAULT_FROM_EMAIL = get_from_env('DEFAULT_FROM_EMAIL', 'ben@adida.net')
DEFAULT_FROM_NAME = get_from_env('DEFAULT_FROM_NAME', 'Ben for Helios')
SERVER_EMAIL = '%s <%s>' % (DEFAULT_FROM_NAME, DEFAULT_FROM_EMAIL)
-# do we queue up each email as a job, or one job for all emails for a given election?
-QUEUE_INDIVIDUAL_EMAILS = (get_from_env('QUEUE_INDIVIDUAL_EMAILS', '1') == '1')
-
LOGIN_URL = '/auth/'
LOGOUT_ON_CONFIRMATION = True
--
GitLab