diff options
author | Erik Johnston <erik@matrix.org> | 2014-08-29 12:10:00 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-08-29 12:10:00 +0100 |
commit | 47fb286184dd27d8098af2fd24d22dd82205d3d5 (patch) | |
tree | 3e186226e18131b7c5d9ca89fdb4075667110c6d /synapse/handlers/events.py | |
parent | Expand architecture section to introduce room IDs, room aliases, user IDs, ev... (diff) | |
parent | Fix a couple of bugs in presence handler related to pushing updatesto the cor... (diff) | |
download | synapse-47fb286184dd27d8098af2fd24d22dd82205d3d5.tar.xz |
Merge branch 'presence_logging' into develop
Diffstat (limited to 'synapse/handlers/events.py')
-rw-r--r-- | synapse/handlers/events.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index e08231406d..980a169b25 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -16,6 +16,7 @@ from twisted.internet import defer from synapse.api.events import SynapseEvent +from synapse.util.logutils import log_function from ._base import BaseHandler @@ -44,6 +45,7 @@ class EventStreamHandler(BaseHandler): self.notifier = hs.get_notifier() @defer.inlineCallbacks + @log_function def get_stream(self, auth_user_id, pagin_config, timeout=0): auth_user = self.hs.parse_userid(auth_user_id) @@ -90,13 +92,15 @@ class EventStreamHandler(BaseHandler): # 10 seconds of grace to allow the client to reconnect again # before we think they're gone def _later(): + logger.debug("_later stopped_user_eventstream %s", auth_user) self.distributor.fire( "stopped_user_eventstream", auth_user ) del self._stop_timer_per_user[auth_user] + logger.debug("Scheduling _later: for %s", auth_user) self._stop_timer_per_user[auth_user] = ( - self.clock.call_later(5, _later) + self.clock.call_later(30, _later) ) |