From 6a5fd9041c03fe93156adf86c19cfb2986ff8f52 Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Fri, 24 Feb 2023 16:42:51 +0100 Subject: [PATCH] Added some stuff to the misc.dummy and misc.random service for testing. (0.21.4) --- Makefile | 9 ++++++--- bin/linspector | 2 +- linspector/services/misc/dummy.py | 10 ++++++---- linspector/services/misc/random.py | 31 ++++++++++++++++++++++++++---- 4 files changed, 40 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 121e51f..b72ac25 100644 --- a/Makefile +++ b/Makefile @@ -33,11 +33,14 @@ help: # ------------------------------ # make daemon +daemon: + PYTHONPATH=$(shell pwd):$(shell pwd)/venv/lib/python$(PYTHON_VRESION)/site-packages/ bin/linspector -d ./etc + +follow: + tail -F ./log/linspector.log + run: PYTHONPATH=$(shell pwd):$(shell pwd)/venv/lib/python$(PYTHON_VERSION)/site-packages/ bin/linspector ./etc rundev: PYTHONPATH=$(shell pwd):$(shell pwd)/venv/lib/python$(PYTHON_VERSION)/site-packages/ bin/linspector ./etc.test.local - -daemon: - PYTHONPATH=$(shell pwd):$(shell pwd)/venv/lib/python$(PYTHON_VRESION)/site-packages/ bin/linspector -d ./etc diff --git a/bin/linspector b/bin/linspector index dd1f84a..940864c 100755 --- a/bin/linspector +++ b/bin/linspector @@ -18,7 +18,7 @@ from linspector.environment import Environment from linspector.linspector import Linspector from linspector.monitors import Monitors -__version__ = '0.21.3' +__version__ = '0.21.4' __author__ = 'Johannes Findeisen ' diff --git a/linspector/services/misc/dummy.py b/linspector/services/misc/dummy.py index 54765df..4d1fefd 100644 --- a/linspector/services/misc/dummy.py +++ b/linspector/services/misc/dummy.py @@ -17,7 +17,9 @@ class DummyService(Service): self.__environment = environment self.__log = log - def execute(self, **kwargs): - self.__log.debug('DummyService object ' + str(self) + ' using kwargs: ' + str(kwargs)) - # log('debug', 'dummy object @' + str(self) + str(self.__kwargs['foo'])) - return + def execute(self, identifier, monitor, service, **kwargs): + self.__log.info('identifier=' + identifier + + ' host=' + monitor.get_host() + + ' service=' + service + + ' status=' + 'OK') + return True diff --git a/linspector/services/misc/random.py b/linspector/services/misc/random.py index 976b10c..9c158dc 100644 --- a/linspector/services/misc/random.py +++ b/linspector/services/misc/random.py @@ -3,19 +3,42 @@ This file is part of Linspector (https://linspector.org/) Copyright (c) 2022 Johannes Findeisen . All Rights Reserved. See LICENSE (MIT license). """ +import hashlib +import random + from linspector.service import Service def create(configuration, environment, log): - return RandomService(configuration, environment, log) + return DummyService(configuration, environment, log) -class RandomService(Service): +class DummyService(Service): def __init__(self, configuration, environment, log): super().__init__(configuration, environment, log) self.__configuration = configuration self.__environment = environment self.__log = log - def execute(self, **kwargs): - return + def execute(self, identifier, monitor, service, **kwargs): + result = random.randint(0, 1) + rnd1 = random.randint(0, 99999999999999) + rnd2 = random.randint(0, 99999999999999) + rnd3 = random.randint(0, 99999999999999) + rnd4 = random.randint(0, 99999999999999) + rnd5 = random.randint(0, 99999999999999) + rnd6 = random.randint(0, 99999999999999) + rnd7 = random.randint(0, 99999999999999) + rnd8 = random.randint(0, 99999999999999) + sha512_1 = hashlib.sha512(str((str(rnd1) + str(rnd2) + str(rnd3) + str(rnd4) + + str(rnd5) + str(rnd6) + str(rnd7) + str(rnd8))). + encode('utf-8')).hexdigest() + sha512_2 = hashlib.sha512(str((str(rnd1) + str(rnd2) + str(rnd3) + str(rnd4) + + str(rnd5) + str(rnd6) + str(rnd7) + str(rnd8) + str(sha512_1))). + encode('utf-8')).hexdigest() + self.__log.info('identifier=' + identifier + + ' host=' + monitor.get_host() + + ' service=' + service + + ' status=' + ('OK' if result == 0 else 'ERROR') + ' sha512=' + + sha512_2) + return True