summary refs log tree commit diff
path: root/synapse/storage/transactions.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-03-01 14:54:29 +0000
committerMark Haines <mjark@negativecurvature.net>2016-03-01 14:54:29 +0000
commitd50ca1b1edf45b630715f1847435eb493842bbdc (patch)
tree5a291e62c4615275e7fc63284b088d82f069c3a9 /synapse/storage/transactions.py
parentMerge pull request #611 from matrix-org/erikj/expiring_cache_size (diff)
parentLoad the current id in the IdGenerator constructor (diff)
downloadsynapse-d50ca1b1edf45b630715f1847435eb493842bbdc.tar.xz
Merge pull request #613 from matrix-org/markjh/yield
Load the current id in the IdGenerator constructor
Diffstat (limited to 'synapse/storage/transactions.py')
-rw-r--r--synapse/storage/transactions.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py

index 4475c451c1..d338dfcf0a 100644 --- a/synapse/storage/transactions.py +++ b/synapse/storage/transactions.py
@@ -117,7 +117,7 @@ class TransactionStore(SQLBaseStore): def _prep_send_transaction(self, txn, transaction_id, destination, origin_server_ts): - next_id = self._transaction_id_gen.get_next_txn(txn) + next_id = self._transaction_id_gen.get_next() # First we find out what the prev_txns should be. # Since we know that we are only sending one transaction at a time,