summary refs log tree commit diff
path: root/synapse/handlers/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-09 16:19:15 +0000
committerErik Johnston <erik@matrix.org>2016-02-09 16:19:15 +0000
commit7b0d846407a593ccd204f82aaa1090b8af8df84c (patch)
tree4848dd2571d064d0caa0f5e45b952306c84f78c7 /synapse/handlers/_base.py
parentPass in current state to push action handler (diff)
downloadsynapse-7b0d846407a593ccd204f82aaa1090b8af8df84c.tar.xz
Atomically persit push actions when we persist the event
Diffstat (limited to 'synapse/handlers/_base.py')
-rw-r--r--synapse/handlers/_base.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index d3f722b22e..064e8723c8 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -264,13 +264,13 @@ class BaseHandler(object):
                         "You don't have permission to redact events"
                     )
 
-        (event_stream_id, max_stream_id) = yield self.store.persist_event(
-            event, context=context
-        )
-
         action_generator = ActionGenerator(self.hs)
         yield action_generator.handle_push_actions_for_event(
-            event, self, context.current_state
+            event, context, self
+        )
+
+        (event_stream_id, max_stream_id) = yield self.store.persist_event(
+            event, context=context
         )
 
         destinations = set()