From 36244b372310b76bc5566757a25b9c88b62d399f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volkan=20=C5=9Eahin?= Date: Tue, 17 May 2016 12:32:48 +0300 Subject: [PATCH] ahenk is running if there is no plugin --- opt/ahenk/base/plugin/plugin_manager.py | 28 ++++++++++++++----------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/opt/ahenk/base/plugin/plugin_manager.py b/opt/ahenk/base/plugin/plugin_manager.py index 3df14eb..67bcfd1 100644 --- a/opt/ahenk/base/plugin/plugin_manager.py +++ b/opt/ahenk/base/plugin/plugin_manager.py @@ -38,18 +38,22 @@ class PluginManager(object): self.logger.info('[PluginManager] Loading plugins...') self.plugins = [] self.logger.debug('[PluginManager] Lookup for possible plugins...') - possibleplugins = os.listdir(self.configManager.get("PLUGIN", "pluginFolderPath")) - self.logger.debug('[PluginManager] Possible plugins.. ' + str(possibleplugins)) - for pname in possibleplugins: - location = os.path.join(self.configManager.get("PLUGIN", "pluginFolderPath"), pname) - if not os.path.isdir(location) or not self.configManager.get("PLUGIN", "mainModuleName") + ".py" in os.listdir(location): - self.logger.debug('It is not a plugin location ! There is no main module - ' + str(location)) - continue - try: - self.loadSinglePlugin(pname) - except Exception as e: - self.logger.error('[PluginManager] Exception occured when loading plugin ! Plugin name : ' + str(pname) + ' Exception : ' + str(e)) - self.logger.info('[PluginManager] Loaded plugins successfully.') + + try: + possible_plugins = os.listdir(self.configManager.get("PLUGIN", "pluginFolderPath")) + self.logger.debug('[PluginManager] Possible plugins: {} '.format(str(possible_plugins))) + for plugin_name in possible_plugins: + location = os.path.join(self.configManager.get("PLUGIN", "pluginFolderPath"), plugin_name) + if not os.path.isdir(location) or not self.configManager.get("PLUGIN", "mainModuleName") + ".py" in os.listdir(location): + self.logger.debug('It is not a plugin location ! There is no main module - {}'.format(str(location))) + continue + try: + self.loadSinglePlugin(plugin_name) + except Exception as e: + self.logger.error('[PluginManager] Exception occurred when loading plugin ! Plugin name : {} .Error Message: {}'.format(str(plugin_name), str(e))) + self.logger.info('[PluginManager] Loaded plugins successfully.') + except Exception as e: + self.logger.warning('[PluginManager] Plugin folder path not found. Error Message: {}'.format(str(e))) def loadSinglePlugin(self, plugin_name): # TODO check already loaded plugin