Fix for crasher in runmailer_pg

pinax · Dec 28, 2023 · 77a6542 · 77a6542
1 parent 863a997
commit 77a6542
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,11 @@
 Change log
 ==========
 
+2.3.1 - unreleased
+------------------
+
+* Fixed rare crasher in runmailer_pg when notifications list is empty.
+
 2.3 - 2023-09-25
 ----------------
 

diff --git a/src/mailer/postgres.py b/src/mailer/postgres.py
@@ -60,7 +60,14 @@ def postgres_send_loop():
             pass
         else:
             conn.poll()
-            last = conn.notifies.pop()
+            try:
+                last = conn.notifies.pop()
+            except IndexError:
+                # Not entirely sure how this happens, but it could only happen
+                # if `notifies` is empty, because there are no more notifications
+                # to process.
+                continue
+
             # We don't care about payload or how many NOTIFY there were,
             # we'll just run once, so drop the rest:
             to_drop = conn.notifies