From ea091686508df95ad53b106787e5cc00eecc56dc Mon Sep 17 00:00:00 2001 From: dgtlmoon Date: Mon, 11 Aug 2025 17:36:51 +0200 Subject: [PATCH] Rename queue workers --- changedetectionio/flask_app.py | 6 +++--- changedetectionio/queue_handlers.py | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/changedetectionio/flask_app.py b/changedetectionio/flask_app.py index 14fd3db6..b4d4f076 100644 --- a/changedetectionio/flask_app.py +++ b/changedetectionio/flask_app.py @@ -12,7 +12,7 @@ from blinker import signal from changedetectionio.strtobool import strtobool from threading import Event -from changedetectionio.queue_handlers import ReliablePriorityQueue, ReliableNotificationQueue +from changedetectionio.queue_handlers import RecheckPriorityQueue, NotificationQueue from changedetectionio import worker_handler from flask import ( @@ -49,8 +49,8 @@ ticker_thread = None extra_stylesheets = [] # Use bulletproof janus-based queues for sync/async reliability -update_q = ReliablePriorityQueue() -notification_q = ReliableNotificationQueue() +update_q = RecheckPriorityQueue() +notification_q = NotificationQueue() MAX_QUEUE_SIZE = 2000 app = Flask(__name__, diff --git a/changedetectionio/queue_handlers.py b/changedetectionio/queue_handlers.py index d9554f4a..8db142cc 100644 --- a/changedetectionio/queue_handlers.py +++ b/changedetectionio/queue_handlers.py @@ -11,7 +11,7 @@ except ImportError: raise -class ReliablePriorityQueue: +class RecheckPriorityQueue: """ Ultra-reliable priority queue using janus for async/sync bridging. @@ -34,9 +34,9 @@ class ReliablePriorityQueue: # Signals for UI updates self.queue_length_signal = signal('queue_length') - logger.debug("ReliablePriorityQueue initialized successfully") + logger.debug("RecheckPriorityQueue initialized successfully") except Exception as e: - logger.critical(f"CRITICAL: Failed to initialize ReliablePriorityQueue: {e}") + logger.critical(f"CRITICAL: Failed to initialize RecheckPriorityQueue: {e}") raise # SYNC INTERFACE (for ticker thread) @@ -161,9 +161,9 @@ class ReliablePriorityQueue: """Close the janus queue""" try: self._janus_queue.close() - logger.debug("ReliablePriorityQueue closed successfully") + logger.debug("RecheckPriorityQueue closed successfully") except Exception as e: - logger.critical(f"CRITICAL: Failed to close ReliablePriorityQueue: {e}") + logger.critical(f"CRITICAL: Failed to close RecheckPriorityQueue: {e}") # COMPATIBILITY METHODS (from original implementation) @property @@ -318,7 +318,7 @@ class ReliablePriorityQueue: logger.critical(f"CRITICAL: Failed to emit get signals: {e}") -class ReliableNotificationQueue: +class NotificationQueue: """ Ultra-reliable notification queue using pure janus. @@ -331,9 +331,9 @@ class ReliableNotificationQueue: self.sync_q = self._janus_queue.sync_q self.async_q = self._janus_queue.async_q self.notification_event_signal = signal('notification_event') - logger.debug("ReliableNotificationQueue initialized successfully") + logger.debug("NotificationQueue initialized successfully") except Exception as e: - logger.critical(f"CRITICAL: Failed to initialize ReliableNotificationQueue: {e}") + logger.critical(f"CRITICAL: Failed to initialize NotificationQueue: {e}") raise def put(self, item: Dict[str, Any], block: bool = True, timeout: Optional[float] = None): @@ -390,9 +390,9 @@ class ReliableNotificationQueue: """Close the janus queue""" try: self._janus_queue.close() - logger.debug("ReliableNotificationQueue closed successfully") + logger.debug("NotificationQueue closed successfully") except Exception as e: - logger.critical(f"CRITICAL: Failed to close ReliableNotificationQueue: {e}") + logger.critical(f"CRITICAL: Failed to close NotificationQueue: {e}") def _emit_notification_signal(self, item: Dict[str, Any]): """Emit notification signal"""