diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2018-01-27 17:56:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-27 17:56:25 +0100 |
| commit | 4b0f06e99c00ea092046a591797de4b12a1314c3 (patch) | |
| tree | f536d77545fbec5504f8c3b42e2627809bd50b7c /synapse/app/user_dir.py | |
| parent | Merge pull request #2827 from matrix-org/fix_server_500_on_public_rooms_call_... (diff) | |
| parent | Factor out get_db_conn to HomeServer base class (diff) | |
| download | synapse-4b0f06e99c00ea092046a591797de4b12a1314c3.tar.xz | |
Merge pull request #2830 from matrix-org/rav/factor_out_get_conn
Factor out get_db_conn to HomeServer base class
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) |