Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into get_pdu_limiting

This commit is contained in:
Erik Johnston 2015-02-17 09:48:23 +00:00
parent baa5b9a975 bfffd2e108
commit 0194e71e99
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
synapse/federation/federation_server.py
View File

@ -331,7 +331,6 @@ class FederationServer(FederationBase):
) )
if already_seen: if already_seen:
logger.debug("Already seen pdu %s", pdu.event_id) logger.debug("Already seen pdu %s", pdu.event_id)
defer.returnValue({})
return return
# Check signature. # Check signature.
@ -367,7 +366,13 @@ class FederationServer(FederationBase):
pdu.room_id, min_depth pdu.room_id, min_depth
) )
if min_depth and pdu.depth > min_depth and max_recursion > 0: if min_depth and pdu.depth < min_depth:
# This is so that we don't notify the user about this
# message, to work around the fact that some events will
# reference really really old events we really don't want to
# send to the clients.
pdu.internal_metadata.outlier = True
elif min_depth and pdu.depth > min_depth and max_recursion > 0:
for event_id, hashes in pdu.prev_events: for event_id, hashes in pdu.prev_events:
if event_id not in have_seen: if event_id not in have_seen:
logger.debug( logger.debug(
@ -418,7 +423,7 @@ class FederationServer(FederationBase):
except: except:
logger.warn("Failed to get state for event: %s", pdu.event_id) logger.warn("Failed to get state for event: %s", pdu.event_id)
ret = yield self.handler.on_receive_pdu( yield self.handler.on_receive_pdu(
origin, origin,
pdu, pdu,
backfilled=False, backfilled=False,
@ -426,8 +431,6 @@ class FederationServer(FederationBase):
auth_chain=auth_chain, auth_chain=auth_chain,
) )
defer.returnValue(ret)
def __str__(self): def __str__(self):
return "<ReplicationLayer(%s)>" % self.server_name return "<ReplicationLayer(%s)>" % self.server_name