MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-06-18 10:38:21 +02:00
Code Issues Projects Releases Wiki Activity

Fix copy + paste fails

Browse source
This commit is contained in:
Erik Johnston 2016-08-03 17:17:26 +01:00
parent 4c56bedee3
commit bcc9cda8ca
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
synapse/federation/federation_client.py
View file

@ -411,8 +411,13 @@ class FederationClient(FederationBase):
return srvs
batch_size = 20
for i in xrange(0, len(missing_events), batch_size):
batch = missing_events[i:i + batch_size]
while missing_events:
batch = []
try:
for _ in range(0, batch_size):
batch.append(missing_events.pop())
except KeyError:
pass
deferreds = [
self.get_pdu(
@ -423,9 +428,9 @@ class FederationClient(FederationBase):
]
res = yield defer.DeferredList(deferreds, consumeErrors=True)
for (result, val), (e_id, _) in res:
if result and val:
signed_events.append(val)
for success, (result, e_id) in res:
if success and result:
signed_events.append(result)
else:
failed_to_fetch.add(e_id)

2
synapse/federation/federation_server.py
View file

@ -623,7 +623,7 @@ class FederationServer(FederationBase):
origin, pdu.room_id, pdu.event_id,
)
except:
logger.warn("Failed to get state for event: %s", pdu.event_id)
logger.exception("Failed to get state for event: %s", pdu.event_id)
yield self.handler.on_receive_pdu(
origin,