From 09e4c1c85548845330a5dae79cb06d92c587b708 Mon Sep 17 00:00:00 2001
From: Slava Kyrachevsky <slava.deb@gmail.com>
Date: Tue, 21 Feb 2017 12:30:34 +0200
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=B8=D0=BB=D0=B8=20=D1=83=D0=B6=D0=B5=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D0=B8=D1=81=D1=8C=D0=BC=D0=BE=20=D0=BF=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/emencia/django/newsletter/mailer.py | 11 +++++++++++
 requirements.txt                         |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/emencia/django/newsletter/mailer.py b/apps/emencia/django/newsletter/mailer.py
index dc9c041e..85fddc1c 100644
--- a/apps/emencia/django/newsletter/mailer.py
+++ b/apps/emencia/django/newsletter/mailer.py
@@ -71,6 +71,8 @@ from emencia.django.newsletter.settings import \
 
 import HTMLParser
 import chardet
+import redis
+from redis_collections import List
 
 from theme.models import Theme
 
@@ -651,9 +653,16 @@ class Mailer(NewsLetterSender):
         # if self.verbose:
         #     print '%i emails will be sent' % number_of_recipients
 
+        r = redis.StrictRedis()
+
         # FIXME: Временно сделана отправка только 1 письма.
         # См FIXME в команде send_newsletter
         for i, contact in enumerate(expedition_list, 1):
+            l = List(key='newsletter_sending_contacts', redis=r)
+            if contact.pk in l:
+                continue
+            l.append(contact.pk)
+
             print 'sending to contact: %s, %s (%s)' % (contact.pk, contact.email, timezone.now())
             send = True
             # if self.verbose:
@@ -700,6 +709,8 @@ class Mailer(NewsLetterSender):
                 self.smtp.quit()
                 self.smtp_connect()
 
+            l.remove(contact.pk)
+
         # маркируем оставшиеся контакты на второй этап
         self.mark_contacts_for_second_stage()
 
diff --git a/requirements.txt b/requirements.txt
index f8fe67c1..14f6d5b2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -52,11 +52,12 @@ pytils==0.3
 pytz==2016.10
 raven==5.32.0
 redis==2.10.1
+redis-collections==0.4.2
 regex==2014.11.14
 requests==2.2.1
 requests-oauthlib==0.4.0
 scipy==0.18.1
-six==1.6.1
+six==1.10.0
 SOAPpy==0.12.22
 solid-i18n==1.1.1
 sorl-thumbnail==11.12.1b0