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/push_rule.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/push_rule.py')
| -rw-r--r-- | synapse/storage/push_rule.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py index bb5c14d912..56e69495b1 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py @@ -226,7 +226,7 @@ class PushRuleStore(SQLBaseStore): if txn.rowcount == 0: # We didn't update a row with the given rule_id so insert one - push_rule_id = self._push_rule_id_gen.get_next_txn(txn) + push_rule_id = self._push_rule_id_gen.get_next() self._simple_insert_txn( txn, @@ -279,7 +279,7 @@ class PushRuleStore(SQLBaseStore): defer.returnValue(ret) def _set_push_rule_enabled_txn(self, txn, user_id, rule_id, enabled): - new_id = self._push_rules_enable_id_gen.get_next_txn(txn) + new_id = self._push_rules_enable_id_gen.get_next() self._simple_upsert_txn( txn, "push_rules_enable", |