Additional fixes to ensure we don't block forever during shutdown.

Refs #2877
coleifer · Apr 23, 2024 · 519a84e · 519a84e
1 parent 1cca5dc
commit 519a84e
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/playhouse/sqliteq.py b/playhouse/sqliteq.py
@@ -281,8 +281,18 @@ def stop(self):
         with self._qlock:
             if self._is_stopped:
                 return False
+
             self._write_queue.put((SHUTDOWN, None))
             self._writer.join()
+
+            # Empty queue of any remaining tasks.
+            while not self._write_queue.empty():
+                op, obj = self._write_queue.get()
+                if op == PAUSE or op == UNPAUSE:
+                    obj.set()
+                elif op == QUERY:
+                    obj.set_result(None, ShutdownException())
+
             self._is_stopped = True
             return True