From 98fa44f6ff926f7741ba1c19747f0f9de7eebf38 Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Tue, 27 Sep 2022 21:37:04 +0200 Subject: [PATCH] Renamed .ini files to .conf. Look more familiar to me. Some fixes too. --- etc/{linspector.ini => linspector.conf} | 2 +- etc/monitors/network1/{gateway.ini => gateway.conf} | 0 etc/monitors/network2/{gateway.ini => gateway.conf} | 0 etc/notifications/{email.ini => email.conf} | 0 etc/plugins/{httpserver.ini => httpserver.conf} | 0 linspector/core/configuration.py | 6 +++--- linspector/core/monitors.py | 2 +- linspector/plugins/httpserver.py | 9 +++++---- linspector/plugins/lish.py | 10 +++++++--- 9 files changed, 17 insertions(+), 12 deletions(-) rename etc/{linspector.ini => linspector.conf} (98%) rename etc/monitors/network1/{gateway.ini => gateway.conf} (100%) rename etc/monitors/network2/{gateway.ini => gateway.conf} (100%) rename etc/notifications/{email.ini => email.conf} (100%) rename etc/plugins/{httpserver.ini => httpserver.conf} (100%) diff --git a/etc/linspector.ini b/etc/linspector.conf similarity index 98% rename from etc/linspector.ini rename to etc/linspector.conf index 36de80e..e55965d 100644 --- a/etc/linspector.ini +++ b/etc/linspector.conf @@ -8,7 +8,7 @@ log_count = 5 log_size = 10485760 pid_file = /var/run/user/1000/linspector.pid ; plugins separated by ','. no whitespaces allowed -plugins = HTTPServer +plugins = Lish ; globally configured tasks will always run on all monitors when no task is configured there. if tasks are configured in ; a monitor then maybe only run tasks from the dedicated monitor. maybe it is a good idea to run global tasks in every ; monitor and the monitor can add tasks to the global settings... need to think about it. diff --git a/etc/monitors/network1/gateway.ini b/etc/monitors/network1/gateway.conf similarity index 100% rename from etc/monitors/network1/gateway.ini rename to etc/monitors/network1/gateway.conf diff --git a/etc/monitors/network2/gateway.ini b/etc/monitors/network2/gateway.conf similarity index 100% rename from etc/monitors/network2/gateway.ini rename to etc/monitors/network2/gateway.conf diff --git a/etc/notifications/email.ini b/etc/notifications/email.conf similarity index 100% rename from etc/notifications/email.ini rename to etc/notifications/email.conf diff --git a/etc/plugins/httpserver.ini b/etc/plugins/httpserver.conf similarity index 100% rename from etc/plugins/httpserver.ini rename to etc/plugins/httpserver.conf diff --git a/linspector/core/configuration.py b/linspector/core/configuration.py index ec007d9..edabd19 100644 --- a/linspector/core/configuration.py +++ b/linspector/core/configuration.py @@ -39,9 +39,9 @@ class Configuration: self.__configuration_path = configuration_path self.__environment = environment - if os.path.isfile(configuration_path + '/linspector.ini'): + if os.path.isfile(configuration_path + '/linspector.conf'): try: - self.__configuration.read(configuration_path + '/linspector.ini', 'utf-8') + self.__configuration.read(configuration_path + '/linspector.conf', 'utf-8') except Exception as err: raise Exception('something went wrong reading the configuration file ' 'linspector.ini in the configuration root path! ({0})'.format(err)) @@ -55,7 +55,7 @@ class Configuration: if not self.__configuration.has_section(target_section): self.__configuration.add_section(target_section) - section_list = glob.glob(configuration_path + '/' + target_section + '/*.ini') + section_list = glob.glob(configuration_path + '/' + target_section + '/*.conf') for section_file in section_list: #print(__file__ + ' (60): ' + section_file) configuration = configparser.ConfigParser() diff --git a/linspector/core/monitors.py b/linspector/core/monitors.py index 2a34496..f362a88 100644 --- a/linspector/core/monitors.py +++ b/linspector/core/monitors.py @@ -48,7 +48,7 @@ class Monitors: monitor_configuration = configparser.ConfigParser() for monitor_group in monitor_groups: monitors_file_list = glob.glob(self.__configuration.get_configuration_path() + - '/monitors/' + monitor_group + '/*.ini') + '/monitors/' + monitor_group + '/*.conf') for monitor_file in monitors_file_list: monitor_configuration.read(monitor_file, 'utf-8') diff --git a/linspector/plugins/httpserver.py b/linspector/plugins/httpserver.py index c9646dd..cce0a80 100644 --- a/linspector/plugins/httpserver.py +++ b/linspector/plugins/httpserver.py @@ -29,16 +29,17 @@ from logging import getLogger logger = getLogger('linspector') -def get(configuration, environment): - return HTTPServerPlugin(configuration, environment) +def get(configuration, environment, linspector): + return HTTPServerPlugin(configuration, environment, linspector) # TODO: check for all required configuration options and set defaults if needed. class HTTPServerPlugin: - def __init__(self, configuration, environment): + def __init__(self, configuration, environment, linspector): self.__configuration = configuration self.__environment = environment + self.__linspector = linspector @cherrypy.expose def index(self): @@ -68,7 +69,7 @@ class HTTPServerPlugin: def playground(self): return 'My Playground!' - def run_server(self): + def run(self): conf = { '/': { # 'tools.sessions.on': True, diff --git a/linspector/plugins/lish.py b/linspector/plugins/lish.py index 2e47f22..8e3499a 100644 --- a/linspector/plugins/lish.py +++ b/linspector/plugins/lish.py @@ -26,13 +26,17 @@ from logging import getLogger logger = getLogger('linspector') -def get(configuration, environment): - return LishPlugin(configuration, environment) +def get(configuration, environment, linspector): + return LishPlugin(configuration, environment, linspector) # TODO: check for all required configuration options and set defaults if needed. class LishPlugin: - def __init__(self, configuration, environment): + def __init__(self, configuration, environment, linspector): self.__configuration = configuration self.__environment = environment + self.__linspector = linspector + + def run(self): + print('hello from Lish!')