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/httppusher.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/httppusher.py')
| -rw-r--r-- | synapse/push/httppusher.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index 9a7db61220..feedb075e2 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -16,6 +16,7 @@ from synapse.push import PusherConfigException from twisted.internet import defer, reactor +from twisted.internet.error import AlreadyCalled, AlreadyCancelled import logging import push_rule_evaluator @@ -109,7 +110,11 @@ class HttpPusher(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 _process(self): |