summary refs log tree commit diff
path: root/synapse/app/synchrotron.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-08-28 13:39:49 +0100
committerRichard van der Hoff <richard@matrix.org>2018-08-28 13:39:49 +0100
commit0b07f02e19e5ed1eba0e74c3863def9f849b5f9a (patch)
treedd17eca36b5b169dc25b309631b4522b3d516cc7 /synapse/app/synchrotron.py
parentMerge pull request #3758 from matrix-org/erikj/admin_contact (diff)
downloadsynapse-0b07f02e19e5ed1eba0e74c3863def9f849b5f9a.tar.xz
Make sure that we close db connections opened during init
We should explicitly close any db connections we open, because failing to do so
can block other transactions as per
https://github.com/matrix-org/synapse/issues/3682.

Let's also try to factor out some of the boilerplate by having server classes
define their datastore class rather than duplicating the whole of `setup`.
Diffstat (limited to 'synapse/app/synchrotron.py')
-rw-r--r--synapse/app/synchrotron.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py
index 27e1998660..6662340797 100644
--- a/synapse/app/synchrotron.py
+++ b/synapse/app/synchrotron.py
@@ -249,10 +249,7 @@ class SynchrotronApplicationService(object):
 
 
 class SynchrotronServer(HomeServer):
-    def setup(self):
-        logger.info("Setting up.")
-        self.datastore = SynchrotronSlavedStore(self.get_db_conn(), self)
-        logger.info("Finished setting up.")
+    DATASTORE_CLASS = SynchrotronSlavedStore
 
     def _listen_http(self, listener_config):
         port = listener_config["port"]