From ba169c5ae63273ac3b22863da49b78ebad5fe8af Mon Sep 17 00:00:00 2001
From: David Trattnig <david.trattnig@o94.at>
Date: Sun, 25 Oct 2020 16:22:04 +0100
Subject: [PATCH] Call config via class var. #44
---
modules/plugins/monitor.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/modules/plugins/monitor.py b/modules/plugins/monitor.py
index 2be55884..248dd520 100644
--- a/modules/plugins/monitor.py
+++ b/modules/plugins/monitor.py
@@ -31,6 +31,7 @@ from socket import socket, AF_INET, SOCK_DGRAM, SOL_SOCKET, SO_BROADCAST
import meta
from modules.cli.redis.adapter import ClientRedisAdapter
+from modules.base.config import AuraConfig
from modules.base.utils import SimpleUtil as SU
from modules.base.mail import AuraMailer
@@ -73,12 +74,12 @@ class AuraMonitor:
heartbeat_running = None
- def __init__(self, config, engine):
+ def __init__(self, engine):
"""
Initialize Monitoring
"""
self.logger = logging.getLogger("AuraEngine")
- self.config = config
+ self.config = AuraConfig.config()
self.engine = engine
self.mailer = AuraMailer(self.config)
self.status = dict()
@@ -96,9 +97,9 @@ class AuraMonitor:
# Heartbeat settings
self.heartbeat_running = False
- self.heartbeat_server = config.get("heartbeat_server")
- self.heartbeat_port = config.get("heartbeat_port")
- self.heartbeat_frequency = config.get("heartbeat_frequency")
+ self.heartbeat_server = self.config.get("heartbeat_server")
+ self.heartbeat_port = self.config.get("heartbeat_port")
+ self.heartbeat_frequency = self.config.get("heartbeat_frequency")
self.heartbeat_socket = socket(AF_INET, SOCK_DGRAM)
self.engine_id = self.get_engine_id()
--
GitLab