Changeset 7169 for lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr

Timestamp:

Apr 25, 2018, 10:01:30 AM (2 years ago)

Author:

Juanma

Message:

Add plugin automanage state status

Location:

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore

Files:

• plugins/zmdManager.py (modified) (1 diff)
• storeManager.py (modified) (3 diffs)

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/zmdManager.py

@@ -17 +17 @@
                 self.dbg=False
                 self.zmd_folder='/usr/share/zero-center/zmds'
-                self.disabled=False
+                self.disabled=None
                 if hasattr(sys,'last_value') or not (os.path.exists(self.zmd_folder)):
                         #If there's an error at this point it only could be an importError caused by xmlrpc 

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py

@@ -17 +17 @@
 class StoreManager():
         def __init__(self,*args,**kwargs):
-                self.dbg=False
+                self.dbg=True
                 if 'dbg' in kwargs.keys():
                         self.dbg=kwargs['dbg']
@@ -78 +78 @@
                                                         self._debug("Disabling plugin %s"%plugin_name)
                                                         continue
+                                                if target_class.disabled==None:
+                                                        self._debug("Plugin %s will manage its state"%plugin_name)
                                                 #Time to check if plugin is disabled or enabled by parm
                                                 #Values for the plugins_registered dict must be the same as the parm name that enables the plugin
-                                                for key,value in class_actions.items():
-                                                        val=value
-                                                        break
-                                                if val in kwargs.keys():
-                                                        if kwargs[val]==True:
-                                                                if target_class.disabled:
+                                                else:
+                                                        for key,value in class_actions.items():
+                                                                val=value
+                                                                break
+                                                        if val in kwargs.keys():
+                                                                if kwargs[val]==True:
+                                                                        if target_class.disabled:
+                                                                                self._debug("Disabling plugin %s"%plugin_name)
+                                                                                continue
+                                                                else:
                                                                         self._debug("Disabling plugin %s"%plugin_name)
                                                                         continue
@@ -91 +97 @@
                                                                 self._debug("Disabling plugin %s"%plugin_name)
                                                                 continue
-                                                else:
-                                                        self._debug("Disabling plugin %s"%plugin_name)
-                                                        continue
                                         if 'cli_mode' in target_class.__dict__.keys():
                                                 if 'cli' in kwargs.keys():