summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-28 15:58:38 +0100
committerErik Johnston <erik@matrix.org>2014-08-28 15:58:38 +0100
commiteb3094ed315fbf3ee1886eef3d6339f2ea259ba7 (patch)
treeb1544dc7aa5dd08c2f878814488f491676338292
parentAdd more logging. Up the event stream timer to 10s (diff)
downloadsynapse-eb3094ed315fbf3ee1886eef3d6339f2ea259ba7.tar.xz
And more logging.
Diffstat (limited to '')
-rw-r--r--synapse/handlers/presence.py1
-rw-r--r--synapse/notifier.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 7741ed3171..a125ea6c10 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -503,6 +503,7 @@ class PresenceHandler(BaseHandler):
             if not self._local_pushmap[localpart]:
                 del self._local_pushmap[localpart]
 
+    @trace_function
     def _stop_polling_remote(self, user, domain, remoteusers):
         for u in remoteusers:
             self._remote_recvmap[u].remove(user)
diff --git a/synapse/notifier.py b/synapse/notifier.py
index 3d3fcdabdb..d222644cb6 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -15,7 +15,7 @@
 
 from twisted.internet import defer, reactor
 
-from synapse.util.logutils import log_function
+from synapse.util.logutils import log_function, trace_function
 
 import logging
 
@@ -119,6 +119,7 @@ class Notifier(object):
                 )
 
     @defer.inlineCallbacks
+    @trace_function
     def on_new_user_event(self, users=[], rooms=[]):
         """ Used to inform listeners that something has happend
         presence/user event wise.