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/registration.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/registration.py')
| -rw-r--r-- | synapse/storage/registration.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index 03a9b66e4a..ad1157f979 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -40,7 +40,7 @@ class RegistrationStore(SQLBaseStore): Raises: StoreError if there was a problem adding this. """ - next_id = yield self._access_tokens_id_gen.get_next() + next_id = self._access_tokens_id_gen.get_next() yield self._simple_insert( "access_tokens", @@ -62,7 +62,7 @@ class RegistrationStore(SQLBaseStore): Raises: StoreError if there was a problem adding this. """ - next_id = yield self._refresh_tokens_id_gen.get_next() + next_id = self._refresh_tokens_id_gen.get_next() yield self._simple_insert( "refresh_tokens", @@ -99,7 +99,7 @@ class RegistrationStore(SQLBaseStore): def _register(self, txn, user_id, token, password_hash, was_guest, make_guest): now = int(self.clock.time()) - next_id = self._access_tokens_id_gen.get_next_txn(txn) + next_id = self._access_tokens_id_gen.get_next() try: if was_guest: |