tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Use store.persist_event rather than pdu_actions.persist_outgoing/pdu_actions.persist_received

Browse source
This commit is contained in:
Mark Haines 2014-08-26 18:57:17 +01:00
parent a498df0428
commit 6966971a28
2 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
synapse/federation/persistence.py
View file

@ -39,25 +39,6 @@ class PduActions(object):
def __init__(self, datastore): def __init__(self, datastore):
self.store = datastore 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 @log_function
def mark_as_processed(self, pdu): def mark_as_processed(self, pdu):
""" Persist the fact that we have fully processed the given `Pdu` """ Persist the fact that we have fully processed the given `Pdu`

4
synapse/federation/replication.py
View file

@ -137,7 +137,7 @@ class ReplicationLayer(object):
#yield self.pdu_actions.populate_previous_pdus(pdu) #yield self.pdu_actions.populate_previous_pdus(pdu)
# Save *before* trying to send # 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] Persisted PDU", pdu.pdu_id)
logger.debug("[%s] transaction_layer.enqueue_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") logger.exception("Failed to get PDU")
# Persist the Pdu, but don't mark it as processed yet. # 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: if not backfilled:
ret = yield self.handler.on_receive_pdu(pdu, backfilled=backfilled) ret = yield self.handler.on_receive_pdu(pdu, backfilled=backfilled)