From 7fd2c934efbed623d2e57db06e6266e16bb3aafb Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Fri, 17 Feb 2017 12:27:31 +0200 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=BF=D0=B8=D1=81=D1=8C=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/emencia/django/newsletter/mailer.py | 3 ++- .../django/newsletter/management/commands/send_newsletter.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/emencia/django/newsletter/mailer.py b/apps/emencia/django/newsletter/mailer.py index 324e7ab9..0fc6802e 100644 --- a/apps/emencia/django/newsletter/mailer.py +++ b/apps/emencia/django/newsletter/mailer.py @@ -41,6 +41,7 @@ from django.template.loader import render_to_string, get_template from django.utils.encoding import smart_str from django.utils.encoding import smart_unicode from django.utils.translation import ugettext as _ +from django.utils import timezone from django.core.files.storage import default_storage from django.core.urlresolvers import reverse from django.core.exceptions import SuspiciousOperation @@ -653,7 +654,7 @@ class Mailer(NewsLetterSender): # FIXME: Временно сделана отправка только 1 письма. # См FIXME в команде send_newsletter for i, contact in enumerate(expedition_list, 1): - print 'sending to contact id:', contact.pk + print 'sending to contact id: %s (%s)' % (contact.pk, timezone.now()) send = True # if self.verbose: # print '- Processing %s/%s (%s)' % ( diff --git a/apps/emencia/django/newsletter/management/commands/send_newsletter.py b/apps/emencia/django/newsletter/management/commands/send_newsletter.py index 4f430415..3ea4e289 100644 --- a/apps/emencia/django/newsletter/management/commands/send_newsletter.py +++ b/apps/emencia/django/newsletter/management/commands/send_newsletter.py @@ -5,6 +5,7 @@ from time import sleep from django.conf import settings from django.utils.translation import activate +from django.utils import timezone from django.core.management.base import NoArgsCommand from emencia.django.newsletter.settings import SEND_HOUR_LOOP @@ -31,7 +32,7 @@ class Command(NoArgsCommand): # else: # self.send() if self.verbose: - print 'End session sending' + print 'End session sending (%s)' % timezone.now() def send(self): for newsletter in Newsletter.objects.exclude(