diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-02-01 18:05:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-01 18:05:47 -0700 |
| commit | 6e87b34f7b7c595d4e5b96e4a0281b8327e5b8b7 (patch) | |
| tree | 35701fcc0456593d736a3405f72a5dfd624b1cad /synapse/app/media_repository.py | |
| parent | pep8 (diff) | |
| parent | Merge pull request #2837 from matrix-org/rav/fix_quarantine_media (diff) | |
| download | synapse-6e87b34f7b7c595d4e5b96e4a0281b8327e5b8b7.tar.xz | |
Merge branch 'develop' into travis/admin-list-media
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) |