If timeout=0, return immediately

2014-08-27 17:21:30 +01:00 · 2014-08-27 17:21:30 +01:00 · 410a74b0f3
parent 92033e4ebc
commit 410a74b0f3
1 changed files with 5 additions and 1 deletions
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@ -178,9 +178,13 @@ class Notifier(object):
        if timeout:
            reactor.callLater(timeout/1000, self._timeout_listener, listener)

-        self._register_with_keys(listener)
+            self._register_with_keys(listener)
+
        yield self._check_for_updates(listener)

+        if not timeout:
+            self._timeout_listener(listener)
+
        return

    def _timeout_listener(self, listener):