diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-08-28 13:39:49 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-08-28 13:39:49 +0100 |
| commit | 0b07f02e19e5ed1eba0e74c3863def9f849b5f9a (patch) | |
| tree | dd17eca36b5b169dc25b309631b4522b3d516cc7 /synapse/app/media_repository.py | |
| parent | Merge pull request #3758 from matrix-org/erikj/admin_contact (diff) | |
| download | synapse-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/media_repository.py')
| -rw-r--r-- | synapse/app/media_repository.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py index fd1f6cbf7e..e3dbb3b4e6 100644 --- a/synapse/app/media_repository.py +++ b/synapse/app/media_repository.py @@ -60,10 +60,7 @@ class MediaRepositorySlavedStore( class MediaRepositoryServer(HomeServer): - def setup(self): - logger.info("Setting up.") - self.datastore = MediaRepositorySlavedStore(self.get_db_conn(), self) - logger.info("Finished setting up.") + DATASTORE_CLASS = MediaRepositorySlavedStore def _listen_http(self, listener_config): port = listener_config["port"] |