From 70e59f571c2d3f7ec39d242e5b3743505357fa12 Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Sat, 1 Oct 2022 06:18:08 +0200 Subject: [PATCH] Bug fixes. There are still more in monitor.py! --- etc/linspector.conf | 2 +- linspector/core/monitor.py | 18 +++++++++--------- linspector/services/misc/dummy.py | 3 ++- linspector/services/net/fritzboxuplink.py | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/etc/linspector.conf b/etc/linspector.conf index 7006ac3..786ea90 100644 --- a/etc/linspector.conf +++ b/etc/linspector.conf @@ -4,7 +4,7 @@ error_receivers = admin@example.com log_file = ~/code/linspector/linspector/log/linspector.log ; available log levels are: "error", "warning", "info" and "debug". -log_level= x +log_level= debug log_count = 5 log_size = 10485760 pid_file = /var/run/user/1000/linspector.pid diff --git a/linspector/core/monitor.py b/linspector/core/monitor.py index 66a4502..4f25985 100644 --- a/linspector/core/monitor.py +++ b/linspector/core/monitor.py @@ -209,26 +209,26 @@ class Monitor: self.last_execution = MonitorExecution(self.get_host()) self.service.execute(self.last_execution) except Exception as err: - log.debug('debug', err) + log('error', err) - self.last_execution.set_execution_end() + #self.last_execution.set_execution_end() - self.handle_threshold(self.service.get_threshold(), - self.last_execution.was_successful()) + #self.handle_threshold(self.service.get_threshold(), + # self.last_execution.was_successful()) #log.info("Job " + self.get_job_id() + # ", Code: " + str(self.last_execution.get_error_code()) + # ", Message: " + str(self.last_execution.get_message())) - self.monitor_information.set_response_message( - self.last_execution.get_response_message(self)) + #self.monitor_information.set_response_message( + # self.last_execution.get_response_message(self)) - self.handle_tasks(self.monitor_information) + #self.handle_tasks(self.monitor_information) else: log('info', "job " + self.get_job_id() + " disabled") - #def get_host(self): - # return self.host + def get_host(self): + return self.host def get_hostgroups(self): return self.hostgroups diff --git a/linspector/services/misc/dummy.py b/linspector/services/misc/dummy.py index 5bcbe67..260f75a 100644 --- a/linspector/services/misc/dummy.py +++ b/linspector/services/misc/dummy.py @@ -20,5 +20,6 @@ class DummyService(Service): self.__kwargs = kwargs def execute(self): - log('debug', 'dummy object @' + str(self) + str(self.__kwargs['foo'])) + log('debug', 'dummy object @' + str(self)) + #log('debug', 'dummy object @' + str(self) + str(self.__kwargs['foo'])) return diff --git a/linspector/services/net/fritzboxuplink.py b/linspector/services/net/fritzboxuplink.py index 389b986..1dcf8dd 100644 --- a/linspector/services/net/fritzboxuplink.py +++ b/linspector/services/net/fritzboxuplink.py @@ -22,5 +22,5 @@ class FritzboxUplinkService(Service): self.__kwargs = kwargs def execute(self): - log('debug', __name__, 'fritzboxuplink object @' + str(self)) + log('debug', 'fritzboxuplink object @' + str(self)) return