diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-03-01 14:32:56 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-03-01 14:32:56 +0000 |
| commit | 54172924c834a954fcbbc6224318140b9e95aa7d (patch) | |
| tree | ff950648c290b028b1993f1c627eaf764744df2a /synapse/storage/registration.py | |
| parent | Merge pull request #607 from matrix-org/dbkr/send_inviter_member_event (diff) | |
| download | synapse-54172924c834a954fcbbc6224318140b9e95aa7d.tar.xz | |
Load the current id in the IdGenerator constructor
Rather than loading them lazily. This allows us to remove all the yield statements and spurious arguments for the get_next methods. It also allows us to replace all instances of get_next_txn with get_next since get_next no longer needs to access the db.
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: |