summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-09 11:41:50 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-09 11:41:50 +0100
commit23d285ad57ca76e8ff2d33f1f6e476930689d9a7 (patch)
treeeb11c9a632f795097e4a6a49bbdbc24c021c7137
parentSYN-339: Cancel the notifier timeout when the notifier fires (diff)
downloadsynapse-23d285ad57ca76e8ff2d33f1f6e476930689d9a7.tar.xz
Unset the timer in the timeout callback so that we don't try to cancel it if it has been called
-rw-r--r--synapse/notifier.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index 0fa77d28ca..e6f37c3736 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -404,6 +404,7 @@ class Notifier(object):
         def _timeout_listener():
             # TODO (erikj): We should probably set to_token to the current
             # max rather than reusing from_token.
+            listener.timer = None
             listener.notify(
                 self,
                 [],