summary refs log tree commit diff
path: root/synapse/storage/appservice.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-11-14 11:43:12 +0000
committerGitHub <noreply@github.com>2017-11-14 11:43:12 +0000
commit6caa379ba18ff4cb6d14a8b9c4cd6b76a618c768 (patch)
tree060360abe1d868d0802e7718e8799a6925ea6440 /synapse/storage/appservice.py
parentMerge pull request #2668 from turt2live/travis/whoami (diff)
parentFix tests for Store.__init__ update (diff)
downloadsynapse-6caa379ba18ff4cb6d14a8b9c4cd6b76a618c768.tar.xz
Merge pull request #2658 from matrix-org/rav/store_heirarchy_init
Make __init__ consistent across Store hierarchy
Diffstat (limited to 'synapse/storage/appservice.py')
-rw-r--r--synapse/storage/appservice.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py

index c63935cb07..d8c84b7141 100644 --- a/synapse/storage/appservice.py +++ b/synapse/storage/appservice.py
@@ -48,8 +48,8 @@ def _make_exclusive_regex(services_cache): class ApplicationServiceStore(SQLBaseStore): - def __init__(self, hs): - super(ApplicationServiceStore, self).__init__(hs) + def __init__(self, db_conn, hs): + super(ApplicationServiceStore, self).__init__(db_conn, hs) self.hostname = hs.hostname self.services_cache = load_appservices( hs.hostname, @@ -173,8 +173,8 @@ class ApplicationServiceStore(SQLBaseStore): class ApplicationServiceTransactionStore(SQLBaseStore): - def __init__(self, hs): - super(ApplicationServiceTransactionStore, self).__init__(hs) + def __init__(self, db_conn, hs): + super(ApplicationServiceTransactionStore, self).__init__(db_conn, hs) @defer.inlineCallbacks def get_appservices_by_state(self, state):