Better injection for the plugin logger.

Neoklosch · Jun 14, 2017 · 2e52965 · 2e52965
1 parent 25ade76
commit 2e52965
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/motey/val/plugins/abstractVAL.py b/motey/val/plugins/abstractVAL.py
@@ -1,7 +1,5 @@
 from yapsy.IPlugin import IPlugin
 
-from motey.di.app_module import DICore
-
 
 class AbstractVAL(IPlugin):
     """
@@ -17,7 +15,7 @@ def __init__(self):
         Constructor of the AbstractVAL.
         """
         super().__init__()
-        self.logger = DICore.logger()
+        self.logger = None
 
     def get_plugin_type(self):
         """
@@ -117,10 +115,12 @@ def activate(self):
         """
         Called at plugin activation.
         """
-        self.logger.info("%s plugin activated" % self.get_plugin_type())
+        if self.logger:
+            self.logger.info("%s plugin activated" % self.get_plugin_type())
 
     def deactivate(self):
         """
         Called when the plugin is disabled.
         """
-        self.logger.info("%s plugin deactivated" % self.get_plugin_type())
+        if self.logger:
+            self.logger.info("%s plugin deactivated" % self.get_plugin_type())
diff --git a/motey/val/plugins/dockerVAL.py b/motey/val/plugins/dockerVAL.py
@@ -99,11 +99,14 @@ def create_instance(self, image_name, parameters={}):
                 parameters.pop('detach')
                 container = client.containers.create(image_name, detach=True, **parameters)
         except ContainerError as ce:
-            self.logger.error("create docker instance > container could not be created")
+            if self.logger:
+                self.logger.error("create docker instance > container could not be created")
         except ImageNotFound as inf:
-            self.logger.error("create docker instance > image not found")
+            if self.logger:
+                self.logger.error("create docker instance > image not found")
         except APIError as apie:
-            self.logger.error("create docker instance > api error")
+            if self.logger:
+                self.logger.error("create docker instance > api error")
         return container_id
 
     def start_instance(self, instance_name, parameters={}):
@@ -123,11 +126,14 @@ def start_instance(self, instance_name, parameters={}):
             container = client.containers.run(instance_name, detach=True, **parameters)
             container_id = container.id
         except ContainerError as ce:
-            self.logger.error("start docker instance > container could not be created")
+            if self.logger:
+                self.logger.error("start docker instance > container could not be created")
         except ImageNotFound as inf:
-            self.logger.error("start docker instance > image not found")
+            if self.logger:
+                self.logger.error("start docker instance > image not found")
         except APIError as apie:
-            self.logger.error("start docker instance > api error")
+            if self.logger:
+                self.logger.error("start docker instance > api error")
         return container_id
 
     def stop_instance(self, container_name):

diff --git a/motey/val/valmanager.py b/motey/val/valmanager.py
@@ -42,10 +42,10 @@ def register_plugins(self):
         """
 
         self.labeling_repository.remove_all_from_type('plugin')
-        print(absolute_file_path("motey/val/plugins"))
         self.plugin_manager.setPluginPlaces([absolute_file_path("motey/val/plugins")])
         self.plugin_manager.collectPlugins()
         for plugin in self.plugin_manager.getAllPlugins():
+            plugin.plugin_object.logger = self.logger
             plugin.plugin_object.activate()
             self.labeling_repository.add(plugin.plugin_object.get_plugin_type(), 'plugin')