Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs which broke federation due to changes in function signatures.

Browse Source
This commit is contained in:
Erik Johnston 2014-11-11 14:19:13 +00:00
parent 02ebb9f0c3
commit 092979b8cc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/federation/replication.py
View File

@ -510,7 +510,7 @@ class ReplicationLayer(object):
@log_function @log_function
def _handle_new_pdu(self, origin, pdu, backfilled=False): def _handle_new_pdu(self, origin, pdu, backfilled=False):
# We reprocess pdus when we have seen them only as outliers # We reprocess pdus when we have seen them only as outliers
existing = yield self._get_persisted_pdu(pdu.event_id) existing = yield self._get_persisted_pdu(origin, pdu.event_id)
if existing and (not existing.outlier or pdu.outlier): if existing and (not existing.outlier or pdu.outlier):
logger.debug("Already seen pdu %s", pdu.event_id) logger.debug("Already seen pdu %s", pdu.event_id)
@ -528,7 +528,7 @@ class ReplicationLayer(object):
if min_depth and pdu.depth > min_depth: if min_depth and pdu.depth > min_depth:
for event_id, hashes in pdu.prev_events: for event_id, hashes in pdu.prev_events:
exists = yield self._get_persisted_pdu(event_id) exists = yield self._get_persisted_pdu(origin, event_id)
if not exists: if not exists:
logger.debug("Requesting pdu %s", event_id) logger.debug("Requesting pdu %s", event_id)

2
synapse/state.py
View File

@ -105,7 +105,7 @@ class StateHandler(object):
defer.returnValue(res[1].get((event_type, state_key))) defer.returnValue(res[1].get((event_type, state_key)))
return return
defer.returnValue(res.values()) defer.returnValue(res[1].values())
@defer.inlineCallbacks @defer.inlineCallbacks
@log_function @log_function