diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-14 10:01:04 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-14 10:01:04 +0100 |
| commit | 10294b60824347d73b01f7ce4add18467d1e6f0c (patch) | |
| tree | 06d04a0a2e0ccf183bfc602ce9694d5958ed7a2e /synapse/storage/_base.py | |
| parent | Make feedback table also store sender. (diff) | |
| parent | grammar fix (diff) | |
| download | synapse-10294b60824347d73b01f7ce4add18467d1e6f0c.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: synapse/storage/_base.py
Diffstat (limited to 'synapse/storage/_base.py')
| -rw-r--r-- | synapse/storage/_base.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 03537b7e3b..489b6bd171 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -28,8 +28,10 @@ logger = logging.getLogger(__name__) class SQLBaseStore(object): def __init__(self, hs): + self.hs = hs self._db_pool = hs.get_db_pool() self.event_factory = hs.get_event_factory() + self._clock = hs.get_clock() def cursor_to_dict(self, cursor): """Converts a SQL cursor into an list of dicts. |