From 1fc684c7e0bce8dd93b9ad99080175b0829bccf1 Mon Sep 17 00:00:00 2001
From: Johannes Findeisen <you@hanez.org>
Date: Thu, 6 Oct 2022 22:42:31 +0200
Subject: [PATCH] renamed get() to create() in plugins and added the log to
 args.

---
 bin/linspector                   |  2 +-
 linspector/core/linspector.py    |  2 +-
 linspector/core/plugin.py        |  5 ++---
 linspector/plugins/httpserver.py | 10 +++++-----
 linspector/plugins/lish.py       | 11 +++++------
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/bin/linspector b/bin/linspector
index eedb7bd..f90fc5d 100755
--- a/bin/linspector
+++ b/bin/linspector
@@ -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
 # stable version.
-__version__ = '0.19.37.dev1'
+__version__ = '0.19.38.dev1'
 __author__ = 'Johannes Findeisen <you@hanez.org>'
 
 
diff --git a/linspector/core/linspector.py b/linspector/core/linspector.py
index 4a4fe79..a94440d 100644
--- a/linspector/core/linspector.py
+++ b/linspector/core/linspector.py
@@ -44,7 +44,7 @@ class Linspector:
                     log('info', 'loading plugin: ' + plugin_option)
                     plugin_package = 'linspector.plugins.' + plugin_option.lower()
                     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
 
         jobstores = {
diff --git a/linspector/core/plugin.py b/linspector/core/plugin.py
index d3f885b..e31b6f5 100644
--- a/linspector/core/plugin.py
+++ b/linspector/core/plugin.py
@@ -3,12 +3,11 @@ This file is part of Linspector (https://linspector.org/)
 Copyright (c) 2022 Johannes Findeisen <you@hanez.org>. All Rights Reserved.
 See LICENSE (MIT license)
 """
-from linspector.core.helpers import log
 
 
 class Plugin:
-
-    def __init__(self, configuration, environment, linspector):
+    def __init__(self, configuration, environment, linspector, log):
         self.__configuration = configuration
         self._environment = environment
         self.__linspector = linspector
+        self.__log = log
diff --git a/linspector/plugins/httpserver.py b/linspector/plugins/httpserver.py
index c12fbf2..632dcbd 100644
--- a/linspector/plugins/httpserver.py
+++ b/linspector/plugins/httpserver.py
@@ -6,22 +6,22 @@ See LICENSE (MIT license)
 import cherrypy
 import json
 
-from linspector.core.helpers import log
 from linspector.core.plugin import Plugin
 
 
-def get(configuration, environment, linspector):
-    return HTTPServerPlugin(configuration, environment, linspector)
+def create(configuration, environment, linspector, log):
+    return HTTPServerPlugin(configuration, environment, linspector, log)
 
 
 # TODO: check for all required configuration options and set defaults if needed.
 class HTTPServerPlugin(Plugin):
 
-    def __init__(self, configuration, environment, linspector):
-        super().__init__(configuration, environment, linspector)
+    def __init__(self, configuration, environment, linspector, log):
+        super().__init__(configuration, environment, linspector, log)
         self.__configuration = configuration
         self.__environment = environment
         self.__linspector = linspector
+        self.__log = log
 
     @cherrypy.expose
     def index(self):
diff --git a/linspector/plugins/lish.py b/linspector/plugins/lish.py
index 9a9478c..3724a26 100644
--- a/linspector/plugins/lish.py
+++ b/linspector/plugins/lish.py
@@ -3,22 +3,21 @@ This file is part of Linspector (https://linspector.org/)
 Copyright (c) 2022 Johannes Findeisen <you@hanez.org>. All Rights Reserved.
 See LICENSE (MIT license)
 """
-from linspector.core.helpers import log
 from linspector.core.plugin import Plugin
 
 
-def get(configuration, environment, linspector):
-    return LishPlugin(configuration, environment, linspector)
+def create(configuration, environment, linspector, log):
+    return LishPlugin(configuration, environment, linspector, log)
 
 
 # TODO: check for all required configuration options and set defaults if needed.
 class LishPlugin(Plugin):
-
-    def __init__(self, configuration, environment, linspector):
-        super().__init__(configuration, environment, linspector)
+    def __init__(self, configuration, environment, linspector, log):
+        super().__init__(configuration, environment, linspector, log)
         self.__configuration = configuration
         self.__environment = environment
         self.__linspector = linspector
+        self.__log = log
 
     def run(self):
         return