diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-02 09:56:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-02 09:56:31 +0100 |
| commit | 733bf442901b256a7dc6a206b912f80a127b1eb3 (patch) | |
| tree | 1ef6aab444cc4343db257dc373ddf5d918a98371 /synapse/push/httppusher.py | |
| parent | Make jenkins dendron test federation read apis (diff) | |
| parent | Merge pull request #970 from matrix-org/erikj/clock (diff) | |
| download | synapse-733bf442901b256a7dc6a206b912f80a127b1eb3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
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): |