summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-01 14:39:23 +0100
committerErik Johnston <erik@matrix.org>2015-05-01 14:41:25 +0100
commit4ac2823b3c7a073a8a249ae402f983cfab92ece2 (patch)
treefbcd9a2334371d35716769ff2d6a3a58ab24cf9c
parentTypo (diff)
downloadsynapse-4ac2823b3c7a073a8a249ae402f983cfab92ece2.tar.xz
Remove inlineCallbacks from non-generator
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 6761121aa3..a14928cb85 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -73,8 +73,6 @@ class FederationHandler(BaseHandler):
         # When joining a room we need to queue any events for that room up
         self.room_queues = {}
 
-    @log_function
-    @defer.inlineCallbacks
     def handle_new_event(self, event, destinations):
         """ Takes in an event from the client to server side, that has already
         been authed and handled by the state module, and sends it to any