From 410a74b0f3b1c32d2ffa85aa7fa5e372a3341b9b Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 27 Aug 2014 17:21:30 +0100
Subject: [PATCH] If timeout=0, return immediately
---
synapse/notifier.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/synapse/notifier.py b/synapse/notifier.py
index 1656717cd7..3d3fcdabdb 100644
--- 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):
--
GitLab