Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timings

erikj/timings
Erik Johnston 2016-06-02 14:08:26 +01:00
commit b997af9ea8
2 changed files with 609 additions and 538 deletions

File diff suppressed because it is too large Load Diff

View File

@ -44,7 +44,8 @@ THROTTLE_RESET_AFTER_MS = (12 * 60 * 60 * 1000)
# does each email include all unread notifs, or just the ones which have happened # does each email include all unread notifs, or just the ones which have happened
# since the last mail? # since the last mail?
INCLUDE_ALL_UNREAD_NOTIFS = True # XXX: this is currently broken as it includes ones from parted rooms(!)
INCLUDE_ALL_UNREAD_NOTIFS = False
class EmailPusher(object): class EmailPusher(object):