mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dispatch Service: always start queue managers (#13355)

Browse Source 
* dispatch service always start queue managers
Only start workers if they are enabled for this node

* style

* please stop mr ide, sir
This commit is contained in:
Tony Murray
2021-10-13 21:49:43 -05:00
committed by GitHub
parent 526afd437f
commit 436487f5f2
2 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
LibreNMS/queuemanager.py
View File

@@ -1,12 +1,12 @@
import logging
import pymysql
import threading
import traceback
from queue import Empty
from subprocess import CalledProcessError
import LibreNMS
import pymysql
import LibreNMS
logger = logging.getLogger(__name__)
@@ -318,7 +318,9 @@ class BillingQueueManager(TimedQueueManager):
:param config: LibreNMS.ServiceConfig reference to the service config object
:param lock_manager: the single instance of lock manager
"""
TimedQueueManager.__init__(self, config, lock_manager, "billing")
TimedQueueManager.__init__(
self, config, lock_manager, "billing", False, config.billing.enabled
)
self.calculate_timer = LibreNMS.RecurringTimer(
self.get_poller_config().calculate,
self.dispatch_calculate_billing,
@@ -370,7 +372,9 @@ class PingQueueManager(TimedQueueManager):
:param config: LibreNMS.ServiceConfig reference to the service config object
:param lock_manager: the single instance of lock manager
"""
TimedQueueManager.__init__(self, config, lock_manager, "ping", True)
TimedQueueManager.__init__(
self, config, lock_manager, "ping", config.ping.enabled
)
self._db = LibreNMS.DB(self.config)
def do_dispatch(self):
@@ -404,7 +408,9 @@ class ServicesQueueManager(TimedQueueManager):
:param config: LibreNMS.ServiceConfig reference to the service config object
:param lock_manager: the single instance of lock manager
"""
TimedQueueManager.__init__(self, config, lock_manager, "services", True)
TimedQueueManager.__init__(
self, config, lock_manager, "services", config.services.enabled
)
self._db = LibreNMS.DB(self.config)
def do_dispatch(self):
@@ -452,7 +458,9 @@ class AlertQueueManager(TimedQueueManager):
:param config: LibreNMS.ServiceConfig reference to the service config object
:param lock_manager: the single instance of lock manager
"""
TimedQueueManager.__init__(self, config, lock_manager, "alerting")
TimedQueueManager.__init__(
self, config, lock_manager, "alerting", config.alerting.enabled
)
self._db = LibreNMS.DB(self.config)
def do_dispatch(self):
@@ -476,7 +484,9 @@ class PollerQueueManager(QueueManager):
:param config: LibreNMS.ServiceConfig reference to the service config object
:param lock_manager: the single instance of lock manager
"""
QueueManager.__init__(self, config, lock_manager, "poller", True)
QueueManager.__init__(
self, config, lock_manager, "poller", True, config.poller.enabled
)
def do_work(self, device_id, group):
if self.lock(device_id, timeout=self.config.poller.frequency):
@@ -515,7 +525,9 @@ class DiscoveryQueueManager(TimedQueueManager):
:param config: LibreNMS.ServiceConfig reference to the service config object
:param lock_manager: the single instance of lock manager
"""
TimedQueueManager.__init__(self, config, lock_manager, "discovery", True)
TimedQueueManager.__init__(
self, config, lock_manager, "discovery", config.discovery.enabled
)
self._db = LibreNMS.DB(self.config)
def do_dispatch(self):