summary refs log tree commit diff
path: root/synapse/federation/replication.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-14 16:44:27 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-14 16:44:27 +0100
commit9aed791fc38790eae6c24e154e7f82ac8509295d (patch)
tree7a819420e36ad06df40b00023827f8021c1f18af /synapse/federation/replication.py
parentremove debugging logging for signing requests (diff)
downloadsynapse-9aed791fc38790eae6c24e154e7f82ac8509295d.tar.xz
SYN-103: Ignore the 'origin' key in received EDUs. Instead take the origin from the transaction itself
Diffstat (limited to 'synapse/federation/replication.py')
-rw-r--r--synapse/federation/replication.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index 2346d55045..9363ac7300 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -319,7 +319,7 @@ class ReplicationLayer(object):
 
         if hasattr(transaction, "edus"):
             for edu in [Edu(**x) for x in transaction.edus]:
-                self.received_edu(edu.origin, edu.edu_type, edu.content)
+                self.received_edu(transaction.origin, edu.edu_type, edu.content)
 
         results = yield defer.DeferredList(dl)