summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-01-25 22:01:02 +0000
committerRichard van der Hoff <richard@matrix.org>2018-01-26 00:56:49 +0000
commit25adde9a04b82a2261404f9b6f9a25cec086f62f (patch)
tree248979282eb0ef9fa4343d1f5e535be966cf008b /synapse/server.py
parentRemove spurious unittest.DEBUG (diff)
downloadsynapse-25adde9a04b82a2261404f9b6f9a25cec086f62f.tar.xz
Factor out get_db_conn to HomeServer base class
This function is identical to all subclasses, so we may as well push it up to
the base class to reduce duplication (and make use of it in the tests)
Diffstat (limited to '')
-rw-r--r--synapse/server.py17
1 files changed, 17 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py
index 99693071b6..ff8a8fbc46 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -307,6 +307,23 @@ class HomeServer(object):
             **self.db_config.get("args", {})
         )
 
+    def get_db_conn(self, run_new_connection=True):
+        """Makes a new connection to the database, skipping the db pool
+
+        Returns:
+            Connection: a connection object implementing the PEP-249 spec
+        """
+        # 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 build_media_repository_resource(self):
         # build the media repo resource. This indirects through the HomeServer
         # to ensure that we only have a single instance of