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

Handle the fact the list.remove raises if element doesn't exist

Browse source
This commit is contained in:
Erik Johnston 2015-02-06 10:53:18 +00:00
parent a93fa42bce
commit 3737329d9b
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
synapse/handlers/federation.py
View file

@ -332,8 +332,11 @@ class FederationHandler(BaseHandler):
# Try the host we successfully got a response to /make_join/ # Try the host we successfully got a response to /make_join/
# request first. # request first.
target_hosts.remove(origin) try:
target_hosts.insert(0, origin) target_hosts.remove(origin)
target_hosts.insert(0, origin)
except ValueError:
pass
ret = yield self.replication_layer.send_join( ret = yield self.replication_layer.send_join(
target_hosts, target_hosts,
@ -521,7 +524,7 @@ class FederationHandler(BaseHandler):
"Failed to get destination from event %s", s.event_id "Failed to get destination from event %s", s.event_id
) )
destinations.remove(origin) destinations.discard(origin)
logger.debug( logger.debug(
"on_send_join_request: Sending event: %s, signatures: %s", "on_send_join_request: Sending event: %s, signatures: %s",
@ -1013,7 +1016,10 @@ class FederationHandler(BaseHandler):
for e in missing_remotes: for e in missing_remotes:
for e_id, _ in e.auth_events: for e_id, _ in e.auth_events:
if e_id in missing_remote_ids: if e_id in missing_remote_ids:
base_remote_rejected.remove(e) try:
base_remote_rejected.remove(e)
except ValueError:
pass
reason_map = {} reason_map = {}