diff --git a/bin/linspector b/bin/linspector index d140326..c86ec6a 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.25.7' +__version__ = '0.25.8' __author__ = 'Johannes Findeisen ' diff --git a/linspector/databases/mysql.py b/linspector/databases/mysql.py index 8c75780..65d6526 100644 --- a/linspector/databases/mysql.py +++ b/linspector/databases/mysql.py @@ -48,7 +48,7 @@ class MySQLDatabase(Database): except Exception as err: log.warning('database configuration error: {0}'.format(err)) - def insert(self, host, identifier, json, message, service, status, timestamp): + def insert(self, host, identifier, json, log, service, status, timestamp): try: self._connection = pymysql.connect(cursorclass=pymysql.cursors.DictCursor, database=self._database, @@ -66,7 +66,7 @@ class MySQLDatabase(Database): 'host, ' \ 'identifier, ' \ 'json, ' \ - 'message, ' \ + 'log, ' \ 'service, ' \ 'status, ' \ 'timestamp ' \ @@ -74,7 +74,7 @@ class MySQLDatabase(Database): str((host if host else 'None')) + '\",\"' + \ str((identifier if identifier else 'None')) + '\",\"' + \ str((json if json else 'None')) + '\",\"' + \ - str((message if message else 'None')) + '\",\"' + \ + str((log if log else 'None')) + '\",\"' + \ str((service if service else 'None')) + '\",\"' + \ str((status if status else 'UNKNOWN')) + '\",\"' + \ str(timestamp) + '\")' diff --git a/linspector/monitor.py b/linspector/monitor.py index ffa4956..e639501 100644 --- a/linspector/monitor.py +++ b/linspector/monitor.py @@ -128,11 +128,11 @@ class Monitor: self._databases[database].insert(self._result['host'], self._identifier, self._result, - self._result['message'], + self._result['log'], self._result['service'], self._result['status'], int(time.time())) - self._log.info(self._result['message']) + self._log.info(self._result['log']) self._log.debug(self._tasks) for task in self._tasks: @@ -141,7 +141,7 @@ class Monitor: self._log.debug("identifier: " + self._identifier) self._log.debug("service: " + self._service) self._log.debug("status: " + self._result['status']) - self._log.debug("message: " + self._result['message']) + self._log.debug("log: " + self._result['log']) self._log.debug("json: " + str(self._result)) except Exception as err: diff --git a/linspector/services/net/port.py b/linspector/services/net/port.py index fb53da9..b5e614e 100644 --- a/linspector/services/net/port.py +++ b/linspector/services/net/port.py @@ -30,6 +30,6 @@ class PortService(Service): return {'error': error, 'host': monitor.get_host(), - 'message': self.get_str(identifier, monitor.get_host(), service, status), + 'log': self.get_str(identifier, monitor.get_host(), service, status), 'service': service, 'status': status} diff --git a/linspector/services/vendor/avm/is_connected.py b/linspector/services/vendor/avm/is_connected.py index d17e59c..4c9966e 100644 --- a/linspector/services/vendor/avm/is_connected.py +++ b/linspector/services/vendor/avm/is_connected.py @@ -31,7 +31,7 @@ class IsConnectedService(Service): result = {'error': error, 'host': monitor.get_host(), - 'message': self.get_str(identifier, monitor.get_host(), service, status), + 'log': self.get_str(identifier, monitor.get_host(), service, status), 'service': service, 'status': status}