summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-26 18:57:17 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-26 18:57:17 +0100
commit6966971a28bb6dfed3daef6e5cd2e41b1ce34788 (patch)
treef1b859319060fa6d8578cb14e80fc8d517097d23 /synapse/federation
parentMove new event boilerplate in room handlers into a method on a base clase. (diff)
downloadsynapse-6966971a28bb6dfed3daef6e5cd2e41b1ce34788.tar.xz
Use store.persist_event rather than pdu_actions.persist_outgoing/pdu_actions.persist_received
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/persistence.py19
-rw-r--r--synapse/federation/replication.py4
2 files changed, 2 insertions, 21 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py
index 76d37a0c52..2286fca821 100644
--- a/synapse/federation/persistence.py
+++ b/synapse/federation/persistence.py
@@ -40,25 +40,6 @@ class PduActions(object):
         self.store = datastore
 
     @log_function
-    def persist_received(self, pdu):
-        """ Persists the given `Pdu` that was received from a remote home
-        server.
-
-        Returns:
-            Deferred
-        """
-        return self.store.persist_event(pdu=pdu)
-
-    @log_function
-    def persist_outgoing(self, pdu):
-        """ Persists the given `Pdu` that this home server created.
-
-        Returns:
-            Deferred
-        """
-        return self.store.persist_event(pdu=pdu)
-
-    @log_function
     def mark_as_processed(self, pdu):
         """ Persist the fact that we have fully processed the given `Pdu`
 
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index cf634a64b2..731cb74dd2 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -137,7 +137,7 @@ class ReplicationLayer(object):
         #yield self.pdu_actions.populate_previous_pdus(pdu)
 
         # Save *before* trying to send
-        yield self.pdu_actions.persist_outgoing(pdu)
+        yield self.store.persist_event(pdu=pdu)
 
         logger.debug("[%s] Persisted PDU", pdu.pdu_id)
         logger.debug("[%s] transaction_layer.enqueue_pdu... ", pdu.pdu_id)
@@ -450,7 +450,7 @@ class ReplicationLayer(object):
                             logger.exception("Failed to get PDU")
 
         # Persist the Pdu, but don't mark it as processed yet.
-        yield self.pdu_actions.persist_received(pdu)
+        yield self.store.persist_event(pdu=pdu)
 
         if not backfilled:
             ret = yield self.handler.on_receive_pdu(pdu, backfilled=backfilled)