diff options
| author | David Baker <dave@matrix.org> | 2016-06-02 15:33:28 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-06-02 15:33:28 +0100 |
| commit | 812b5de0feeb905643faf4decff3d7b566d3dbe9 (patch) | |
| tree | 70c5d4a2dab2e35bc39711392cba52e22e5a145f /synapse/storage | |
| parent | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe (diff) | |
| parent | Fix setting the _clock in SQLBaseStore (diff) | |
| download | synapse-812b5de0feeb905643faf4decff3d7b566d3dbe9.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/_base.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 56a0dd80f3..32c6677d47 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -152,6 +152,7 @@ class SQLBaseStore(object): def __init__(self, hs): self.hs = hs + self._clock = hs.get_clock() self._db_pool = hs.get_db_pool() self._previous_txn_total_time = 0 |