diff --git a/bin/linspector b/bin/linspector index 1128082..51c6d7b 100755 --- a/bin/linspector +++ b/bin/linspector @@ -20,7 +20,7 @@ from linspector.environment import Environment from linspector.linspector import Linspector from linspector.monitors import Monitors -__version__ = '0.28.1' +__version__ = '0.28.2' __author__ = 'Johannes Findeisen ' sys.stderr = open('/dev/null', 'w') diff --git a/linspector/linspector.py b/linspector/linspector.py index 4f1863e..57fb14a 100644 --- a/linspector/linspector.py +++ b/linspector/linspector.py @@ -58,6 +58,8 @@ class Linspector: } if configuration.get_option('linspector', 'max_threads') and not \ configuration.get_option('linspector', 'scheduler_mode') == 'process': + print('Job execution mode: thread') + self._log.info('job execution mode: thread') executors = { 'default': ThreadPoolExecutor(int(configuration.get_option('linspector', 'max_threads'))) @@ -68,6 +70,8 @@ class Linspector: } if configuration.get_option('linspector', 'scheduler_mode'): if configuration.get_option('linspector', 'scheduler_mode') == 'process': + print('Job execution mode: process') + self._log.info('Job execution mode: process') executors = { 'default': ThreadPoolExecutor( int(configuration.get_option('linspector', 'max_threads'))), @@ -88,6 +92,7 @@ class Linspector: start_date = datetime.datetime.now() log.debug(monitors.get_monitors()) monitors = self._monitors.get_monitors() + monitor_count = 0 for monitor in monitors: log.debug(monitor) if configuration.get_option('linspector', 'delta_range'): @@ -136,5 +141,9 @@ class Linspector: ' next=' + str(new_start_date) + ' message=scheduling job') + monitor_count += 1 + + print('Number of monitors scheduled: ' + str(monitor_count)) + if configuration.get_option('linspector', 'start_scheduler') == 'true': self._scheduler['linspector'].start() diff --git a/linspector/monitor.py b/linspector/monitor.py index cdf54e0..f6875b3 100644 --- a/linspector/monitor.py +++ b/linspector/monitor.py @@ -16,6 +16,7 @@ class Monitor: self._configuration = configuration self._enabled = True self._environment = environment + self._error_count = 0 self._host = monitor_configuration.get('monitor', 'host') try: @@ -24,7 +25,6 @@ class Monitor: self._hostgroups = "None" self._identifier = identifier - self._job_threshold = 0 try: self._interval = int(monitor_configuration.get('monitor', 'interval')) @@ -120,6 +120,10 @@ class Monitor: try: self._result = self._services[self._service].execute(self._identifier, self, self._service, **self._args) + + if self._result['status'] == 'ERROR': + self._error_count += 1 + self._log.debug(self._result) self._log.debug(self._tasks) for task in self._tasks: