diff options
author | Erik Johnston <erik@matrix.org> | 2014-10-17 21:02:16 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-10-17 21:02:16 +0100 |
commit | 449739e6a364759a86f73417626af49d6a794e3d (patch) | |
tree | 04b2f39c91ec6098ffe3b380442787ac3ce2908f /synapse/storage/transactions.py | |
parent | Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse (diff) | |
parent | Check that we have auth headers and fail nicely (diff) | |
download | synapse-449739e6a364759a86f73417626af49d6a794e3d.tar.xz |
Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse
Diffstat (limited to 'synapse/storage/transactions.py')
-rw-r--r-- | synapse/storage/transactions.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py index ab4599b468..2ba8e30efe 100644 --- a/synapse/storage/transactions.py +++ b/synapse/storage/transactions.py @@ -87,7 +87,8 @@ class TransactionStore(SQLBaseStore): txn.execute(query, (code, response_json, transaction_id, origin)) - def prep_send_transaction(self, transaction_id, destination, ts, pdu_list): + def prep_send_transaction(self, transaction_id, destination, + origin_server_ts, pdu_list): """Persists an outgoing transaction and calculates the values for the previous transaction id list. @@ -97,7 +98,7 @@ class TransactionStore(SQLBaseStore): Args: transaction_id (str) destination (str) - ts (int) + origin_server_ts (int) pdu_list (list) Returns: @@ -106,11 +107,11 @@ class TransactionStore(SQLBaseStore): return self.runInteraction( self._prep_send_transaction, - transaction_id, destination, ts, pdu_list + transaction_id, destination, origin_server_ts, pdu_list ) - def _prep_send_transaction(self, txn, transaction_id, destination, ts, - pdu_list): + def _prep_send_transaction(self, txn, transaction_id, destination, + origin_server_ts, pdu_list): # First we find out what the prev_txs should be. # Since we know that we are only sending one transaction at a time, @@ -131,7 +132,7 @@ class TransactionStore(SQLBaseStore): None, transaction_id=transaction_id, destination=destination, - ts=ts, + ts=origin_server_ts, response_code=0, response_json=None )) |