diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-03-01 14:54:29 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-03-01 14:54:29 +0000 |
| commit | d50ca1b1edf45b630715f1847435eb493842bbdc (patch) | |
| tree | 5a291e62c4615275e7fc63284b088d82f069c3a9 /synapse/storage/account_data.py | |
| parent | Merge pull request #611 from matrix-org/erikj/expiring_cache_size (diff) | |
| parent | Load the current id in the IdGenerator constructor (diff) | |
| download | synapse-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/account_data.py')
| -rw-r--r-- | synapse/storage/account_data.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/account_data.py b/synapse/storage/account_data.py index 91cbf399b6..21a3240d9d 100644 --- a/synapse/storage/account_data.py +++ b/synapse/storage/account_data.py @@ -163,12 +163,12 @@ class AccountDataStore(SQLBaseStore): ) self._update_max_stream_id(txn, next_id) - with (yield self._account_data_id_gen.get_next(self)) as next_id: + with self._account_data_id_gen.get_next() as next_id: yield self.runInteraction( "add_room_account_data", add_account_data_txn, next_id ) - result = yield self._account_data_id_gen.get_max_token() + result = self._account_data_id_gen.get_max_token() defer.returnValue(result) @defer.inlineCallbacks @@ -202,12 +202,12 @@ class AccountDataStore(SQLBaseStore): ) self._update_max_stream_id(txn, next_id) - with (yield self._account_data_id_gen.get_next(self)) as next_id: + with self._account_data_id_gen.get_next() as next_id: yield self.runInteraction( "add_user_account_data", add_account_data_txn, next_id ) - result = yield self._account_data_id_gen.get_max_token() + result = self._account_data_id_gen.get_max_token() defer.returnValue(result) def _update_max_stream_id(self, txn, next_id): |