From d3f6c4ef36eddb7d996bbf12b92cada809757b8e Mon Sep 17 00:00:00 2001 From: Jessica McKellar Date: Wed, 8 Jan 2014 11:33:12 -0500 Subject: [PATCH] Log the actual sending of digest emails in addition to queuing possible ones. (imported from commit e43ac59e71620fe715db462347db228d5a950aed) --- zerver/lib/digest.py | 14 ++++++++++++++ .../management/commands/enqueue_digest_emails.py | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/zerver/lib/digest.py b/zerver/lib/digest.py index d6cfbfd752..e443bb7de3 100644 --- a/zerver/lib/digest.py +++ b/zerver/lib/digest.py @@ -12,6 +12,19 @@ from zerver.lib.actions import build_message_list, hashchange_encode, \ from zerver.models import UserProfile, UserMessage, Recipient, Stream, \ Subscription +import logging + +log_format = "%(asctime)s: %(message)s" +logging.basicConfig(format=log_format) + +formatter = logging.Formatter(log_format) +file_handler = logging.FileHandler(settings.DIGEST_LOG_PATH) +file_handler.setFormatter(formatter) + +logger = logging.getLogger(__name__) +logger.setLevel(logging.DEBUG) +logger.addHandler(file_handler) + # Digests accumulate 4 types of interesting traffic for a user: # 1. Missed PMs # 2. New streams @@ -198,4 +211,5 @@ def handle_digest_email(user_profile_id, cutoff): if enough_traffic(template_payload["unread_pms"], template_payload["hot_conversations"], new_streams_count, new_users_count): + logger.info("Sending digest email for %s" % (user_profile.email,)) send_digest_email(user_profile, html_content, text_content) diff --git a/zerver/management/commands/enqueue_digest_emails.py b/zerver/management/commands/enqueue_digest_emails.py index 2de9b75e21..e1bc381670 100644 --- a/zerver/management/commands/enqueue_digest_emails.py +++ b/zerver/management/commands/enqueue_digest_emails.py @@ -109,4 +109,5 @@ in a while. cutoff = last_business_day() if inactive_since(user_profile, cutoff): queue_digest_recipient(user_profile, cutoff) - logger.info("Enqueuing digest email for %s" % (user_profile.email,)) + logger.info("%s is inactive, queuing for potential digest" % ( + user_profile.email,))