diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-01-25 22:01:02 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-01-26 00:56:49 +0000 |
| commit | 25adde9a04b82a2261404f9b6f9a25cec086f62f (patch) | |
| tree | 248979282eb0ef9fa4343d1f5e535be966cf008b /synapse/app/media_repository.py | |
| parent | Remove spurious unittest.DEBUG (diff) | |
| download | synapse-25adde9a04b82a2261404f9b6f9a25cec086f62f.tar.xz | |
Factor out get_db_conn to HomeServer base class
This function is identical to all subclasses, so we may as well push it up to the base class to reduce duplication (and make use of it in the tests)
Diffstat (limited to 'synapse/app/media_repository.py')
| -rw-r--r-- | synapse/app/media_repository.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py index eab1597aaa..1ed1ca8772 100644 --- a/synapse/app/media_repository.py +++ b/synapse/app/media_repository.py @@ -60,19 +60,6 @@ class MediaRepositorySlavedStore( class MediaRepositoryServer(HomeServer): - def get_db_conn(self, run_new_connection=True): - # Any param beginning with cp_ is a parameter for adbapi, and should - # not be passed to the database engine. - db_params = { - k: v for k, v in self.db_config.get("args", {}).items() - if not k.startswith("cp_") - } - db_conn = self.database_engine.module.connect(**db_params) - - if run_new_connection: - self.database_engine.on_new_connection(db_conn) - return db_conn - def setup(self): logger.info("Setting up.") self.datastore = MediaRepositorySlavedStore(self.get_db_conn(), self) |