Merge branch 'develop' of github.com:matrix-org/synapse into erikj/perf

This commit is contained in:
Erik Johnston 2015-05-14 12:01:38 +01:00
commit 36ea26c5c0
3 changed files with 14 additions and 3 deletions

View file

@ -310,6 +310,7 @@ class SQLBaseStore(object):
self._access_tokens_id_gen = IdGenerator("access_tokens", "id", self)
self._pushers_id_gen = IdGenerator("pushers", "id", self)
self._push_rule_id_gen = IdGenerator("push_rules", "id", self)
self._push_rules_enable_id_gen = IdGenerator("push_rules_enable", "id", self)
def start_profiling(self):
self._previous_loop_ts = self._clock.time_msec()