tune email notifs, fix CSS a bit, and add debugging details

pull/786/head
Matthew Hodgson 2016-05-16 18:58:38 +01:00
parent 0e8364c7f5
commit cbd2adc95e
4 changed files with 46 additions and 9 deletions

View File

@ -2,6 +2,11 @@ body {
margin: 0px; margin: 0px;
} }
pre, code {
word-break: break-word;
white-space: pre-wrap;
}
#page { #page {
font-family: 'Open Sans', Helvetica, Arial, Sans-Serif; font-family: 'Open Sans', Helvetica, Arial, Sans-Serif;
font-color: #454545; font-color: #454545;

View File

@ -30,6 +30,17 @@
{% include 'room.html' with context %} {% include 'room.html' with context %}
{% endfor %} {% endfor %}
<div class="footer"> <div class="footer">
<small>
Sending at {{ reason.now|format_ts("%c") }} due to activity in room {{ reason.room_name }} because:<br/>
1. The most recent notifiable event was received at {{ reason.received_at|format_ts("%c") }}
which is more than {{ "%.1f"|format(reason.delay_before_mail_ms / (60*1000)) }} (delay_before_mail_ms) mins ago.<br/>
{% if reason.last_sent_ts %}
2. The last time we sent a mail for this room was {{ reason.last_sent_ts|format_ts("%c") }},
which is more than {{ "%.1f"|format(reason.throttle_ms / (60*1000)) }} (current throttle_ms) mins ago.
{% else %}
2. We can't remember the last time we sent a mail for this room.
{% endif %}
</small>
<a href="{{ unsubscribe_link }}">Unsubscribe</a> <a href="{{ unsubscribe_link }}">Unsubscribe</a>
</div> </div>
</td> </td>

View File

@ -26,11 +26,14 @@ logger = logging.getLogger(__name__)
# The amount of time we always wait before ever emailing about a notification # The amount of time we always wait before ever emailing about a notification
# (to give the user a chance to respond to other push or notice the window) # (to give the user a chance to respond to other push or notice the window)
DELAY_BEFORE_MAIL_MS = 2 * 60 * 1000 DELAY_BEFORE_MAIL_MS = 10 * 60 * 1000
THROTTLE_START_MS = 2 * 60 * 1000 # THROTTLE is the minimum time between mail notifications sent for a given room.
THROTTLE_MAX_MS = (2 * 60 * 1000) * (2 ** 11) # ~3 days # Each room maintains its own throttle counter, but each new mail notification
THROTTLE_MULTIPLIER = 2 # sends the pending notifications for all rooms.
THROTTLE_START_MS = 10 * 60 * 1000
THROTTLE_MAX_MS = 24 * 60 * 60 * 1000 # (2 * 60 * 1000) * (2 ** 11) # ~3 days
THROTTLE_MULTIPLIER = 6 # 10 mins, 1 hour, 6 hours, 24 hours
# If no event triggers a notification for this long after the previous, # If no event triggers a notification for this long after the previous,
# the throttle is released. # the throttle is released.
@ -146,7 +149,18 @@ class EmailPusher(object):
# *one* email updating the user on their notifications, # *one* email updating the user on their notifications,
# we then consider all previously outstanding notifications # we then consider all previously outstanding notifications
# to be delivered. # to be delivered.
yield self.send_notification(unprocessed)
# debugging:
reason = {
'room_id': push_action['room_id'],
'now': self.clock.time_msec(),
'received_at': received_at,
'delay_before_mail_ms': DELAY_BEFORE_MAIL_MS,
'last_sent_ts': self.get_room_last_sent_ts(push_action['room_id']),
'throttle_ms': self.get_room_throttle_ms(push_action['room_id']),
}
yield self.send_notification(unprocessed, reason)
yield self.save_last_stream_ordering_and_success(max([ yield self.save_last_stream_ordering_and_success(max([
ea['stream_ordering'] for ea in unprocessed ea['stream_ordering'] for ea in unprocessed
@ -195,7 +209,8 @@ class EmailPusher(object):
""" """
Determines whether throttling should prevent us from sending an email Determines whether throttling should prevent us from sending an email
for the given room for the given room
Returns: True if we should send, False if we should not Returns: The timestamp when we are next allowed to send an email notif
for this room
""" """
last_sent_ts = self.get_room_last_sent_ts(room_id) last_sent_ts = self.get_room_last_sent_ts(room_id)
throttle_ms = self.get_room_throttle_ms(room_id) throttle_ms = self.get_room_throttle_ms(room_id)
@ -244,8 +259,9 @@ class EmailPusher(object):
) )
@defer.inlineCallbacks @defer.inlineCallbacks
def send_notification(self, push_actions): def send_notification(self, push_actions, reason):
logger.info("Sending notif email for user %r", self.user_id) logger.info("Sending notif email for user %r", self.user_id)
yield self.mailer.send_notification_mail( yield self.mailer.send_notification_mail(
self.user_id, self.email, push_actions self.user_id, self.email, push_actions, reason
) )

View File

@ -92,7 +92,7 @@ class Mailer(object):
) )
@defer.inlineCallbacks @defer.inlineCallbacks
def send_notification_mail(self, user_id, email_address, push_actions): def send_notification_mail(self, user_id, email_address, push_actions, reason):
raw_from = email.utils.parseaddr(self.hs.config.email_notif_from)[1] raw_from = email.utils.parseaddr(self.hs.config.email_notif_from)[1]
raw_to = email.utils.parseaddr(email_address)[1] raw_to = email.utils.parseaddr(email_address)[1]
@ -143,12 +143,17 @@ class Mailer(object):
notifs_by_room, state_by_room, notif_events, user_id notifs_by_room, state_by_room, notif_events, user_id
) )
reason['room_name'] = calculate_room_name(
state_by_room[reason['room_id']], user_id, fallback_to_members=False
)
template_vars = { template_vars = {
"user_display_name": user_display_name, "user_display_name": user_display_name,
"unsubscribe_link": self.make_unsubscribe_link(), "unsubscribe_link": self.make_unsubscribe_link(),
"summary_text": summary_text, "summary_text": summary_text,
"app_name": self.app_name, "app_name": self.app_name,
"rooms": rooms, "rooms": rooms,
"reason": reason,
} }
html_text = self.notif_template_html.render(**template_vars) html_text = self.notif_template_html.render(**template_vars)