diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-02-13 16:45:36 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-02-13 16:45:36 +0000 |
| commit | ddb6a79b68da119bd91659ab8046553a02a4066e (patch) | |
| tree | 3a92b5c0738163474765a9ce4f1b7894fed9efde /synapse/app/user_dir.py | |
| parent | move search reindex to schema 47 (diff) | |
| parent | Merge branch 'develop' into matthew/gin_work_mem (diff) | |
| download | synapse-ddb6a79b68da119bd91659ab8046553a02a4066e.tar.xz | |
Merge branch 'matthew/gin_work_mem' into matthew/hit_the_gin
Diffstat (limited to 'synapse/app/user_dir.py')
| -rw-r--r-- | synapse/app/user_dir.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py index a48c4a2ae6..494ccb702c 100644 --- a/synapse/app/user_dir.py +++ b/synapse/app/user_dir.py @@ -92,19 +92,6 @@ class UserDirectorySlaveStore( class UserDirectoryServer(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 = UserDirectorySlaveStore(self.get_db_conn(), self) |