diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-08-02 10:18:15 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-08-02 10:18:15 +0100 |
| commit | 54de6a812ae3d4ecefa9a1972afa8c114b6a5b9c (patch) | |
| tree | 7a70b5d7cc8f01afccce3cded6e5413e1b0de8e8 /synapse/push/emailpusher.py | |
| parent | Fix adding emails on registration (diff) | |
| parent | Merge pull request #970 from matrix-org/erikj/clock (diff) | |
| download | synapse-54de6a812ae3d4ecefa9a1972afa8c114b6a5b9c.tar.xz | |
Merge branch 'develop' into dbkr/fix_add_email_on_register
Diffstat (limited to 'synapse/push/emailpusher.py')
| -rw-r--r-- | synapse/push/emailpusher.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py index e224b68291..6600c9cd55 100644 --- a/synapse/push/emailpusher.py +++ b/synapse/push/emailpusher.py @@ -14,6 +14,7 @@ # limitations under the License. from twisted.internet import defer, reactor +from twisted.internet.error import AlreadyCalled, AlreadyCancelled import logging @@ -92,7 +93,11 @@ class EmailPusher(object): def on_stop(self): if self.timed_call: - self.timed_call.cancel() + try: + self.timed_call.cancel() + except (AlreadyCalled, AlreadyCancelled): + pass + self.timed_call = None @defer.inlineCallbacks def on_new_notifications(self, min_stream_ordering, max_stream_ordering): @@ -189,7 +194,10 @@ class EmailPusher(object): soonest_due_at = should_notify_at if self.timed_call is not None: - self.timed_call.cancel() + try: + self.timed_call.cancel() + except (AlreadyCalled, AlreadyCancelled): + pass self.timed_call = None if soonest_due_at is not None: |