Use an explicit transaction when registering listeners

See #310 — sqlalchemy-2.0 migration
sde1000 · Jan 25, 2025 · c9e0ebc · c9e0ebc
1 parent 8708ef4
commit c9e0ebc
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/quicktill/listen.py b/quicktill/listen.py
@@ -66,18 +66,19 @@ def update_listening_channels(self):
 
         to_add = wanted - self._db_listening
         to_remove = self._db_listening - wanted
-        for channel in to_add:
-            log.debug("listen for %s", channel)
-            self.connection.execute(
-                text(f"LISTEN {channel};")
-                .execution_options(autocommit=True))
-            self._db_listening.add(channel)
-        for channel in to_remove:
-            log.debug("stop listening for %s", channel)
-            self.connection.execute(
-                text(f"UNLISTEN {channel};")
-                .execution_options(autocommit=True))
-            self._db_listening.discard(channel)
+        with self.connection.begin():
+            for channel in to_add:
+                log.debug("listen for %s", channel)
+                self.connection.execute(
+                    text(f"LISTEN {channel};")
+                    .execution_options(autocommit=True))
+                self._db_listening.add(channel)
+            for channel in to_remove:
+                log.debug("stop listening for %s", channel)
+                self.connection.execute(
+                    text(f"UNLISTEN {channel};")
+                    .execution_options(autocommit=True))
+                self._db_listening.discard(channel)
         if not self._db_listening:
             # We're not listening for anything any more - close the connection
             log.debug("close database connection")