summary refs log tree commit diff
path: root/synapse/federation/replication.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2014-10-14 10:06:04 +0100
committerMark Haines <mjark@negativecurvature.net>2014-10-14 10:06:04 +0100
commit636a0dbde7082a485c0d4ac58137ecb75f7f23fe (patch)
tree780ad4589dbde7e0fab416496faee5f3c351d169 /synapse/federation/replication.py
parentReplace on_send_callback with something a bit clearer so that we can sign mes... (diff)
parenttypoe (diff)
downloadsynapse-636a0dbde7082a485c0d4ac58137ecb75f7f23fe.tar.xz
Merge pull request #8 from matrix-org/server2server_signing
Server2server signing
Diffstat (limited to 'synapse/federation/replication.py')
-rw-r--r--synapse/federation/replication.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index 5f96f79998..2346d55045 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -492,7 +492,6 @@ class _TransactionQueue(object):
     """
 
     def __init__(self, hs, transaction_actions, transport_layer):
-
         self.server_name = hs.hostname
         self.transaction_actions = transaction_actions
         self.transport_layer = transport_layer
@@ -591,7 +590,7 @@ class _TransactionQueue(object):
 
             transaction = Transaction.create_new(
                 ts=self._clock.time_msec(),
-                transaction_id=self._next_txn_id,
+                transaction_id=str(self._next_txn_id),
                 origin=self.server_name,
                 destination=destination,
                 pdus=pdus,
@@ -609,18 +608,17 @@ class _TransactionQueue(object):
 
             # FIXME (erikj): This is a bit of a hack to make the Pdu age
             # keys work
-            def cb(transaction):
+            def json_data_cb():
+                data = transaction.get_dict()
                 now = int(self._clock.time_msec())
-                if "pdus" in transaction:
-                    for p in transaction["pdus"]:
+                if "pdus" in data:
+                    for p in data["pdus"]:
                         if "age_ts" in p:
                             p["age"] = now - int(p["age_ts"])
-
-                return transaction
+                return data
 
             code, response = yield self.transport_layer.send_transaction(
-                transaction,
-                on_send_callback=cb,
+                transaction, json_data_cb
             )
 
             logger.debug("TX [%s] Sent transaction", destination)