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

renamed get() to create() in plugins and added the log to args.

Browse source
This commit is contained in:
Johannes Findeisen 2022-10-06 22:42:31 +02:00
commit 1fc684c7e0
5 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/linspector
View file

@ -37,7 +37,7 @@ logger = logging.getLogger('linspector')
# i currently only increase the 3rd number because the goal is that 0.19.* will become the first # i currently only increase the 3rd number because the goal is that 0.19.* will become the first
# stable version. # stable version.
__version__ = '0.19.37.dev1' __version__ = '0.19.38.dev1'
__author__ = 'Johannes Findeisen <you@hanez.org>' __author__ = 'Johannes Findeisen <you@hanez.org>'

2
linspector/core/linspector.py
View file

@ -44,7 +44,7 @@ class Linspector:
log('info', 'loading plugin: ' + plugin_option) log('info', 'loading plugin: ' + plugin_option)
plugin_package = 'linspector.plugins.' + plugin_option.lower() plugin_package = 'linspector.plugins.' + plugin_option.lower()
plugin_module = importlib.import_module(plugin_package) plugin_module = importlib.import_module(plugin_package)
plugin = plugin_module.get(configuration, environment, self) plugin = plugin_module.create(configuration, environment, log, self)
plugins[plugin_option.lower()] = plugin plugins[plugin_option.lower()] = plugin
jobstores = { jobstores = {

5
linspector/core/plugin.py
View file

@ -3,12 +3,11 @@ This file is part of Linspector (https://linspector.org/)
Copyright (c) 2022 Johannes Findeisen <you@hanez.org>. All Rights Reserved. Copyright (c) 2022 Johannes Findeisen <you@hanez.org>. All Rights Reserved.
See LICENSE (MIT license) See LICENSE (MIT license)
""" """
from linspector.core.helpers import log
class Plugin: class Plugin:
def __init__(self, configuration, environment, linspector, log):
def __init__(self, configuration, environment, linspector):
self.__configuration = configuration self.__configuration = configuration
self._environment = environment self._environment = environment
self.__linspector = linspector self.__linspector = linspector
self.__log = log

10
linspector/plugins/httpserver.py
View file

@ -6,22 +6,22 @@ See LICENSE (MIT license)
import cherrypy import cherrypy
import json import json
from linspector.core.helpers import log
from linspector.core.plugin import Plugin from linspector.core.plugin import Plugin
def get(configuration, environment, linspector): def create(configuration, environment, linspector, log):
return HTTPServerPlugin(configuration, environment, linspector) return HTTPServerPlugin(configuration, environment, linspector, log)
# TODO: check for all required configuration options and set defaults if needed. # TODO: check for all required configuration options and set defaults if needed.
class HTTPServerPlugin(Plugin): class HTTPServerPlugin(Plugin):
def __init__(self, configuration, environment, linspector): def __init__(self, configuration, environment, linspector, log):
super().__init__(configuration, environment, linspector) super().__init__(configuration, environment, linspector, log)
self.__configuration = configuration self.__configuration = configuration
self.__environment = environment self.__environment = environment
self.__linspector = linspector self.__linspector = linspector
self.__log = log
@cherrypy.expose @cherrypy.expose
def index(self): def index(self):

11
linspector/plugins/lish.py
View file

@ -3,22 +3,21 @@ This file is part of Linspector (https://linspector.org/)
Copyright (c) 2022 Johannes Findeisen <you@hanez.org>. All Rights Reserved. Copyright (c) 2022 Johannes Findeisen <you@hanez.org>. All Rights Reserved.
See LICENSE (MIT license) See LICENSE (MIT license)
""" """
from linspector.core.helpers import log
from linspector.core.plugin import Plugin from linspector.core.plugin import Plugin
def get(configuration, environment, linspector): def create(configuration, environment, linspector, log):
return LishPlugin(configuration, environment, linspector) return LishPlugin(configuration, environment, linspector, log)
# TODO: check for all required configuration options and set defaults if needed. # TODO: check for all required configuration options and set defaults if needed.
class LishPlugin(Plugin): class LishPlugin(Plugin):
def __init__(self, configuration, environment, linspector, log):
def __init__(self, configuration, environment, linspector): super().__init__(configuration, environment, linspector, log)
super().__init__(configuration, environment, linspector)
self.__configuration = configuration self.__configuration = configuration
self.__environment = environment self.__environment = environment
self.__linspector = linspector self.__linspector = linspector
self.__log = log
def run(self): def run(self):
return return