diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-02-03 22:40:28 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-02-03 22:40:28 +0000 |
| commit | bb9f0f3cdb57882248b6426dd4ec5bd5781daaef (patch) | |
| tree | 41a8ee0b215406119ec5ef44cf0a3326a8ae1636 /synapse/app/homeserver.py | |
| parent | oops (diff) | |
| parent | Merge pull request #2837 from matrix-org/rav/fix_quarantine_media (diff) | |
| download | synapse-bb9f0f3cdb57882248b6426dd4ec5bd5781daaef.tar.xz | |
Merge branch 'develop' into matthew/gin_work_mem
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 92ab3b311b..cb82a415a6 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -266,19 +266,6 @@ class SynapseHomeServer(HomeServer): except IncorrectDatabaseSetup as e: quit_with_error(e.message) - 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(config_options): """ |