summary refs log tree commit diff
path: root/synapse/storage/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-26 19:49:42 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-26 19:49:42 +0100
commitd2798de660c84dea775f3c79ff8200baf084d244 (patch)
tree11501e9446fe13244e2e5e71d0747f32a124e1e1 /synapse/storage/__init__.py
parentUse store.persist_event rather than pdu_actions.persist_outgoing/pdu_actions.... (diff)
downloadsynapse-d2798de660c84dea775f3c79ff8200baf084d244.tar.xz
Fold federation/handler into handlers/federation
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r--synapse/storage/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index a726b7346b..130387184f 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -60,7 +60,9 @@ class DataStore(RoomMemberStore, RoomStore,
     def persist_event(self, event=None, backfilled=False, pdu=None):
         # FIXME (erikj): This should be removed when we start amalgamating
         # event and pdu storage
-        yield self.hs.get_federation().fill_out_prev_events(event)
+        if event is not None:
+            federation_handler = self.hs.get_handlers().federation_handler
+            yield federation_handler.fill_out_prev_events(event)
 
         stream_ordering = None
         if backfilled: