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
This commit is contained in:
Tony Murray
2021-10-14 23:39:08 -05:00
committed by GitHub
parent da57ea65f6
commit eb653619a3
3 changed files with 30 additions and 12 deletions

View File

@ -222,9 +222,9 @@ class DB:
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 @@ class RedisLock(Lock):
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 @@ class RedisUniqueQueue(object):
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"]
)

View File

@ -41,8 +41,8 @@ class QueueManager:
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 @@ class QueueManager:
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 @@ class QueueManager:
: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 @@ class PingQueueManager(TimedQueueManager):
: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 @@ class ServicesQueueManager(TimedQueueManager):
: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 @@ class AlertQueueManager(TimedQueueManager):
: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 @@ class DiscoveryQueueManager(TimedQueueManager):
: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)

View File

@ -369,7 +369,7 @@ class Service:
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 @@ class Service:
"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(