summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-01-27 16:05:23 +0000
committerDavid Baker <dave@matrix.org>2015-01-27 16:05:23 +0000
commit5eacaeb4a73aa4c4ff450d7b23acabe79124171f (patch)
treeb9117efd8b8bbc3a5b351c4dbb78f267ca0a17e3
parentNeed a defer.inlineCallbacks here as we yield in it: otherwise nothing in the... (diff)
downloadsynapse-5eacaeb4a73aa4c4ff450d7b23acabe79124171f.tar.xz
or of course we could just return the deferred
Diffstat (limited to '')
-rw-r--r--synapse/handlers/events.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index 851eebf600..48de3630e3 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -99,7 +99,6 @@ class EventStreamHandler(BaseHandler):
 
                     # 10 seconds of grace to allow the client to reconnect again
                     #   before we think they're gone
-                    @defer.inlineCallbacks
                     def _later():
                         logger.debug(
                             "_later stopped_user_eventstream %s", auth_user
@@ -107,7 +106,7 @@ class EventStreamHandler(BaseHandler):
 
                         self._stop_timer_per_user.pop(auth_user, None)
 
-                        yield self.distributor.fire(
+                        return self.distributor.fire(
                             "stopped_user_eventstream", auth_user
                         )