Enable reconnection in DB pool (#179)

matrix-org · Mar 18, 2021 · 5c6dfcf · 5c6dfcf
1 parent 5e259d8
commit 5c6dfcf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/changelog.d/179.bugfix b/changelog.d/179.bugfix
@@ -0,0 +1 @@
+Fix bug where Sygnal would not recover after losing connection to the database.
diff --git a/sygnal/sygnal.py b/sygnal/sygnal.py
@@ -149,9 +149,15 @@ def __init__(self, config, custom_reactor, tracer=opentracing.tracer):
 
         if db_name == "psycopg2":
             logger.info("Using postgresql database")
+
+            # By default enable `cp_reconnect`. We need to fiddle with db_args in case
+            # someone has explicitly set `cp_reconnect`.
+            db_args = dict(config["database"].get("args", {}))
+            db_args.setdefault("cp_reconnect", True)
+
             self.database_engine = "postgresql"
             self.database = ConnectionPool(
-                "psycopg2", cp_reactor=self.reactor, **config["database"].get("args")
+                "psycopg2", cp_reactor=self.reactor, **db_args
             )
         elif db_name == "sqlite3":
             logger.info("Using sqlite database")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix bug where Sygnal would not recover after losing connection to the database.