From eb653619a30c0cfa30561741c610c88229fa5af6 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Thu, 14 Oct 2021 23:39:08 -0500 Subject: [PATCH] Dispatcher bugfix queues not being disabled properly (#13364) * Dispatcher bugfix queues not being disabled properly Introduced in #13355 Affected queues: Alerting, Discovery, Services, Ping Adjust log level of several messages * better formatting? looks like garbage python black --- LibreNMS/__init__.py | 8 ++++---- LibreNMS/queuemanager.py | 15 ++++++++------- LibreNMS/service.py | 19 ++++++++++++++++++- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/LibreNMS/__init__.py b/LibreNMS/__init__.py index f041851ccafc..4b2af698b1a6 100644 --- a/LibreNMS/__init__.py +++ b/LibreNMS/__init__.py @@ -222,9 +222,9 @@ def connect(self): import pymysql pymysql.install_as_MySQLdb() - logger.info("Using pure python SQL client") + logger.debug("Using pure python SQL client") except ImportError: - logger.info("Using other SQL client") + logger.debug("Using other SQL client") try: import MySQLdb @@ -421,7 +421,7 @@ def __init__(self, namespace="lock", **redis_kwargs): self._redis = redis.Redis(**kwargs) self._redis.ping() self._namespace = namespace - logger.info( + logger.debug( "Created redis lock manager with socket_timeout of {}s".format( redis_kwargs["socket_timeout"] ) @@ -503,7 +503,7 @@ def __init__(self, name, namespace="queue", **redis_kwargs): self._redis = redis.Redis(**kwargs) self._redis.ping() self.key = "{}:{}".format(namespace, name) - logger.info( + logger.debug( "Created redis queue with socket_timeout of {}s".format( redis_kwargs["socket_timeout"] ) diff --git a/LibreNMS/queuemanager.py b/LibreNMS/queuemanager.py index 989b04c74c9e..f824061a3d21 100644 --- a/LibreNMS/queuemanager.py +++ b/LibreNMS/queuemanager.py @@ -41,8 +41,8 @@ def __init__( self._stop_event = threading.Event() - logger.info("Groups: {}".format(self.config.group)) - logger.info( + logger.debug("Groups: {}".format(self.config.group)) + logger.debug( "{} QueueManager created: {} workers, {}s frequency".format( self.type.title(), self.get_poller_config().workers, @@ -126,6 +126,7 @@ def start(self): if hasattr(self.config.group, "__iter__") else [self.config.group] ) + logger.debug("Starting {} workers for {}".format(workers, self.type)) if self.uses_groups: for group in groups: group_workers = max(int(workers / len(groups)), 1) @@ -198,7 +199,7 @@ def _create_queue(self, queue_type, group): :param group: :return: """ - logger.info("Creating queue {}".format(self.queue_name(queue_type, group))) + logger.debug("Creating queue {}".format(self.queue_name(queue_type, group))) try: return LibreNMS.RedisUniqueQueue( self.queue_name(queue_type, group), @@ -373,7 +374,7 @@ def __init__(self, config, lock_manager): :param lock_manager: the single instance of lock manager """ TimedQueueManager.__init__( - self, config, lock_manager, "ping", config.ping.enabled + self, config, lock_manager, "ping", False, config.ping.enabled ) self._db = LibreNMS.DB(self.config) @@ -409,7 +410,7 @@ def __init__(self, config, lock_manager): :param lock_manager: the single instance of lock manager """ TimedQueueManager.__init__( - self, config, lock_manager, "services", config.services.enabled + self, config, lock_manager, "services", False, config.services.enabled ) self._db = LibreNMS.DB(self.config) @@ -459,7 +460,7 @@ def __init__(self, config, lock_manager): :param lock_manager: the single instance of lock manager """ TimedQueueManager.__init__( - self, config, lock_manager, "alerting", config.alerting.enabled + self, config, lock_manager, "alerting", False, config.alerting.enabled ) self._db = LibreNMS.DB(self.config) @@ -526,7 +527,7 @@ def __init__(self, config, lock_manager): :param lock_manager: the single instance of lock manager """ TimedQueueManager.__init__( - self, config, lock_manager, "discovery", config.discovery.enabled + self, config, lock_manager, "discovery", False, config.discovery.enabled ) self._db = LibreNMS.DB(self.config) diff --git a/LibreNMS/service.py b/LibreNMS/service.py index 05557bb6478e..4c78f9c67806 100644 --- a/LibreNMS/service.py +++ b/LibreNMS/service.py @@ -369,7 +369,7 @@ def service_age(self): return time.time() - self.start_time def attach_signals(self): - logger.info( + logger.debug( "Attaching signal handlers on thread %s", threading.current_thread().name ) signal(SIGTERM, self.terminate) # capture sigterm and exit gracefully @@ -451,6 +451,23 @@ def start(self): "redis" if isinstance(self._lm, LibreNMS.RedisLock) else "internal", ) ) + logger.info( + "Queue Workers: Discovery={} Poller={} Services={} Alerting={} Billing={} Ping={}".format( + self.config.discovery.workers + if self.config.discovery.enabled + else "disabled", + self.config.poller.workers + if self.config.poller.enabled + else "disabled", + self.config.services.workers + if self.config.services.enabled + else "disabled", + "enabled" if self.config.alerting.enabled else "disabled", + "enabled" if self.config.billing.enabled else "disabled", + "enabled" if self.config.ping.enabled else "disabled", + ) + ) + if self.config.update_enabled: logger.info( "Maintenance tasks will be run every {}".format(