2 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index 23bc0b6e28..f2df2175b6 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -98,8 +98,9 @@ class EventStreamHandler(BaseHandler):
                     )
                     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(10, _later)
                 )
 
 
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 1be3845691..7741ed3171 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -517,6 +517,7 @@ class PresenceHandler(BaseHandler):
         )
 
     @defer.inlineCallbacks
+    @trace_function
     def push_presence(self, user, statuscache):
         assert(user.is_mine)
 
@@ -559,6 +560,7 @@ class PresenceHandler(BaseHandler):
             )
 
     @defer.inlineCallbacks
+    @trace_function
     def _send_presence_to_distribution(self, srcuser, localusers=set(),
             remotedomains=set(), statuscache=None):