summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-08-14 16:22:08 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-08-14 16:22:08 +0100
commit53147e5ae4c02f1d9bc4a4b5242a8ac1f476b1b8 (patch)
treeb653e55342f1bbd10b52eea5a3bb96abe6323fd0
parentWe really don't need debug logging of all the SQL statements we execute; we'r... (diff)
downloadsynapse-53147e5ae4c02f1d9bc4a4b5242a8ac1f476b1b8.tar.xz
Reflect user's messages up to themselves before pushing it to federatoin; also release roomlock before touching federation so we don't halt progress on the world
-rw-r--r--synapse/handlers/room.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index eae40765b3..5d0379254b 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -94,10 +94,10 @@ class MessageHandler(BaseHandler):
                 event.room_id
             )
 
-            yield self.hs.get_federation().handle_new_event(event)
-
             self.notifier.on_new_room_event(event, store_id)
 
+        yield self.hs.get_federation().handle_new_event(event)
+
     @defer.inlineCallbacks
     def get_messages(self, user_id=None, room_id=None, pagin_config=None,
                      feedback=False):