summary refs log tree commit diff
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-25 11:26:29 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-25 11:26:29 +0200
commit66d752dd1b7a5a87a48e0c3e36a0ba45c9580213 (patch)
tree6f0fa0f98b5404dabbe49e051da5e63c03927de1
parentMerge remote-tracking branch 'origin/hotfixes-0.0.1' into develop (diff)
parentEnsure that we don't have duplicate hosts in the pdu destinations list (diff)
downloadsynapse-66d752dd1b7a5a87a48e0c3e36a0ba45c9580213.tar.xz
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--synapse/federation/replication.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py

index 8030d0963f..cf634a64b2 100644 --- a/synapse/federation/replication.py +++ b/synapse/federation/replication.py
@@ -509,10 +509,10 @@ class _TransactionQueue(object): # a transaction in progress. If we do, stick it in the pending_pdus # table and we'll get back to it later. - destinations = [ + destinations = set([ d for d in pdu.destinations if d != self.server_name - ] + ]) logger.debug("Sending to: %s", str(destinations))