armin/linspector
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added error count to database and more logging. (0.28.3)

Browse source
This commit is contained in:
Johannes Findeisen 2023-09-03 06:51:04 +02:00
commit 4936bc68a7
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/linspector
View file

@ -20,7 +20,7 @@ from linspector.environment import Environment
from linspector.linspector import Linspector from linspector.linspector import Linspector
from linspector.monitors import Monitors from linspector.monitors import Monitors
__version__ = '0.28.2' __version__ = '0.28.3'
__author__ = 'Johannes Findeisen <you@hanez.org>' __author__ = 'Johannes Findeisen <you@hanez.org>'
sys.stderr = open('/dev/null', 'w') sys.stderr = open('/dev/null', 'w')

2
linspector/linspector.py
View file

@ -143,7 +143,7 @@ class Linspector:
monitor_count += 1 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': if configuration.get_option('linspector', 'start_scheduler') == 'true':
self._scheduler['linspector'].start() self._scheduler['linspector'].start()

7
linspector/monitor.py
View file

@ -114,7 +114,8 @@ class Monitor:
def execute(self): def execute(self):
self._log.debug('identifier=' + self._identifier + ' object=' + str(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: if self._enabled:
try: try:
@ -124,10 +125,12 @@ class Monitor:
if self._result['status'] == 'ERROR': if self._result['status'] == 'ERROR':
self._error_count += 1 self._error_count += 1
self._log.debug('error count: ' + str(self._error_count))
self._log.debug(self._result) self._log.debug(self._result)
self._log.debug(self._tasks) self._log.debug(self._tasks)
for task in 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._identifier,
self._result, self._result,
self._result['log'], self._result['log'],

4
linspector/tasks/mysql.py
View file

@ -48,7 +48,7 @@ class MySQLTask(Task):
except Exception as err: except Exception as err:
log.error('task mysql configuration error: {0}'.format(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: try:
self._connection = pymysql.connect(cursorclass=pymysql.cursors.DictCursor, self._connection = pymysql.connect(cursorclass=pymysql.cursors.DictCursor,
database=self._database, database=self._database,
@ -63,6 +63,7 @@ class MySQLTask(Task):
with (self._connection): with (self._connection):
with self._connection.cursor() as cursor: with self._connection.cursor() as cursor:
sql = 'INSERT INTO ' + self._table + ' (' \ sql = 'INSERT INTO ' + self._table + ' (' \
'error_count, ' \
'host, ' \ 'host, ' \
'identifier, ' \ 'identifier, ' \
'json, ' \ 'json, ' \
@ -71,6 +72,7 @@ class MySQLTask(Task):
'status, ' \ 'status, ' \
'timestamp ' \ 'timestamp ' \
') VALUES (\"' + \ ') VALUES (\"' + \
str((error_count if error_count else '0')) + '\",\"' + \
str((host if host else 'None')) + '\",\"' + \ str((host if host else 'None')) + '\",\"' + \
str((identifier if identifier else 'None')) + '\",\"' + \ str((identifier if identifier else 'None')) + '\",\"' + \
str((json if json else 'None')) + '\",\"' + \ str((json if json else 'None')) + '\",\"' + \