diff --git a/node-daemon/pvcnoded/Daemon.py b/node-daemon/pvcnoded/Daemon.py index 74eb880d..c78a0af3 100644 --- a/node-daemon/pvcnoded/Daemon.py +++ b/node-daemon/pvcnoded/Daemon.py @@ -1024,14 +1024,14 @@ def entrypoint(): state="i", ) - # Set up the node monitoring instance + # Set up the node monitoring instance and thread monitoring_instance = MonitoringInstance.MonitoringInstance( zkhandler, config, logger, this_node ) # Start keepalived thread keepalive_timer = pvcnoded.util.keepalive.start_keepalive_timer( - logger, config, zkhandler, this_node, monitoring_instance + logger, config, zkhandler, this_node ) # Tick loop; does nothing since everything is async diff --git a/node-daemon/pvcnoded/util/keepalive.py b/node-daemon/pvcnoded/util/keepalive.py index 9a5df7c6..ec62b266 100644 --- a/node-daemon/pvcnoded/util/keepalive.py +++ b/node-daemon/pvcnoded/util/keepalive.py @@ -51,7 +51,7 @@ libvirt_vm_states = { } -def start_keepalive_timer(logger, config, zkhandler, this_node, monitoring_instance): +def start_keepalive_timer(logger, config, zkhandler, this_node): keepalive_interval = config["keepalive_interval"] logger.out( f"Starting keepalive timer ({keepalive_interval} second interval)", state="s" @@ -59,7 +59,7 @@ def start_keepalive_timer(logger, config, zkhandler, this_node, monitoring_insta keepalive_timer = BackgroundScheduler() keepalive_timer.add_job( node_keepalive, - args=(logger, config, zkhandler, this_node, monitoring_instance), + args=(logger, config, zkhandler, this_node), trigger="interval", seconds=keepalive_interval, ) @@ -674,7 +674,7 @@ def collect_vm_stats(logger, config, zkhandler, this_node, queue): # Keepalive update function -def node_keepalive(logger, config, zkhandler, this_node, monitoring_instance): +def node_keepalive(logger, config, zkhandler, this_node): debug = config["debug"] # Display node information to the terminal