From da3992c341ff1482c9e8caef707e2ad1e5d008c3 Mon Sep 17 00:00:00 2001 From: wad Date: Thu, 19 Apr 2018 16:21:19 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=BE=D0=B1=D0=B5=D1=80=D0=BD=D1=83=D0=BB?= =?UTF-8?q?=20=D0=BE=D1=82=D1=81=D1=8B=D0=BB=D0=BA=D1=83=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=87=D1=82=D1=8B=20=D0=BF=D1=80=D0=B8=20=D0=BF=D0=BB=D0=B0?= =?UTF-8?q?=D1=82=D0=B5=D0=B6=D0=B5=20=D0=B2=20try/except?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- finance/views.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/finance/views.py b/finance/views.py index 16ddc85..2352592 100644 --- a/finance/views.py +++ b/finance/views.py @@ -324,16 +324,21 @@ class YandexPay(APIView): 'shopFailURL': settings.YANDEX_MONEY_FAIL_URL, }) - msg = EmailMessage( - 'Пользователь перешёл на страницу оплаты.', - '''Пользователь "%s" перешёл на страницу оплаты курса "%s".''' - % (pay.invoice.bill.user.email, Course.objects.get(token=pay.invoice.bill.course_token).title), - 'robo@skillbox.ru', - [pay.invoice.bill.opener.email], - bcc=['dmitry.dolya@skillbox.ru'], - ) + try: + msg = EmailMessage( + 'Пользователь перешёл на страницу оплаты.', + '''Пользователь "%s" перешёл на страницу оплаты курса "%s".''' + % (pay.invoice.bill.user.email, Course.objects.get(token=pay.invoice.bill.course_token).title), + 'robo@skillbox.ru', + [pay.invoice.bill.opener.email], + bcc=['dmitry.dolya@skillbox.ru'], + ) - msg.send() + msg.send() + except Exception as exc: + logger_yandex.error('YandexPay: Email not sended', exc_info=True, extra={ + 'exc': exc + }) return redirect(r.url) From a6d279183faf973c67ace44067604b10814bbd13 Mon Sep 17 00:00:00 2001 From: wad Date: Thu, 19 Apr 2018 16:25:44 +0300 Subject: [PATCH 2/2] periodic_billing crontab(day_of_month='1', hour='1', minute='1') --- lms/celery.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lms/celery.py b/lms/celery.py index 95c4803..9e37861 100644 --- a/lms/celery.py +++ b/lms/celery.py @@ -21,7 +21,8 @@ register_signal(client) app.conf.beat_schedule = { 'periodic_billing': { - 'schedule': crontab(minute='*/1'), + 'schedule': crontab(day_of_month='1', hour='1', minute='1'), # заглушка на время отладки + # 'schedule': crontab(minute='*/1'), # crontab(minute='0',hour='*/3',), 'task': 'finance.tasks.periodic_billing' }