From 4936bc68a79114443ed96c5a3e5f1d10a2251297 Mon Sep 17 00:00:00 2001
From: Johannes Findeisen <you@hanez.org>
Date: Sun, 3 Sep 2023 06:51:04 +0200
Subject: [PATCH] Added error count to database and more logging. (0.28.3)

---
 bin/linspector            | 2 +-
 linspector/linspector.py  | 2 +-
 linspector/monitor.py     | 7 +++++--
 linspector/tasks/mysql.py | 4 +++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/bin/linspector b/bin/linspector
index 51c6d7b..49f3731 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.2'
+__version__ = '0.28.3'
 __author__ = 'Johannes Findeisen <you@hanez.org>'
 
 sys.stderr = open('/dev/null', 'w')
diff --git a/linspector/linspector.py b/linspector/linspector.py
index 57fb14a..e5c56e3 100644
--- a/linspector/linspector.py
+++ b/linspector/linspector.py
@@ -143,7 +143,7 @@ class Linspector:
 
             monitor_count += 1
 
-        print('Number of monitors scheduled: ' + str(monitor_count))
+        print('Number of scheduled monitors: ' + 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 f6875b3..615829e 100644
--- a/linspector/monitor.py
+++ b/linspector/monitor.py
@@ -114,7 +114,8 @@ class Monitor:
 
     def execute(self):
         self._log.debug('identifier=' + self._identifier + ' object=' + str(self))
-        self._log.debug('identifier=' + self._identifier + ' message=handle call to service')
+        self._log.debug('identifier=' + self._identifier + ' kwargs=' + str(self._args) +
+                        ' message=handle call to service')
 
         if self._enabled:
             try:
@@ -124,10 +125,12 @@ class Monitor:
                 if self._result['status'] == 'ERROR':
                     self._error_count += 1
 
+                self._log.debug('error count: ' + str(self._error_count))
                 self._log.debug(self._result)
                 self._log.debug(self._tasks)
                 for task in self._tasks:
-                    self._tasks[task].execute(self._result['host'],
+                    self._tasks[task].execute(self._error_count,
+                                              self._result['host'],
                                               self._identifier,
                                               self._result,
                                               self._result['log'],
diff --git a/linspector/tasks/mysql.py b/linspector/tasks/mysql.py
index f05773a..338c98e 100644
--- a/linspector/tasks/mysql.py
+++ b/linspector/tasks/mysql.py
@@ -48,7 +48,7 @@ class MySQLTask(Task):
         except Exception as err:
             log.error('task mysql configuration error: {0}'.format(err))
 
-    def execute(self, host, identifier, json, log, service, status, timestamp):
+    def execute(self, error_count, host, identifier, json, log, service, status, timestamp):
         try:
             self._connection = pymysql.connect(cursorclass=pymysql.cursors.DictCursor,
                                                database=self._database,
@@ -63,6 +63,7 @@ class MySQLTask(Task):
             with (self._connection):
                 with self._connection.cursor() as cursor:
                     sql = 'INSERT INTO ' + self._table + ' (' \
+                          'error_count, ' \
                           'host, ' \
                           'identifier, ' \
                           'json, ' \
@@ -71,6 +72,7 @@ class MySQLTask(Task):
                           'status, ' \
                           'timestamp ' \
                           ') VALUES (\"' + \
+                          str((error_count if error_count else '0')) + '\",\"' + \
                           str((host if host else 'None')) + '\",\"' + \
                           str((identifier if identifier else 'None')) + '\",\"' + \
                           str((json if json else 'None')) + '\",\"' + \