1 files changed, 7 insertions, 6 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 56a34bd50b..e5066c48ef 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -255,12 +255,13 @@ class SynapseHomeServer(HomeServer):
quit_with_error(e.message)
def get_db_conn(self):
- db_conn = self.database_engine.module.connect(
- **{
- k: v for k, v in self.db_config.get("args", {}).items()
- if not k.startswith("cp_")
- }
- )
+ # 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)
self.database_engine.on_new_connection(db_conn)
return db_conn
|