Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-04-10 00:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

change pluginLoader and exception-handling

Browse source 
- if the function plugin.onLoad() throws an exception the plugin will skipped
- change exception-handling for pluginLoader
This commit is contained in:
JHCD 2015-06-29 23:24:48 +02:00
parent a1d610ee6a
commit 09b9cc5f7d
9 changed files with 100 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

27
includes/pluginLoader.py
View file

@ -29,20 +29,21 @@ def loadPlugins():
for i in getPlugins():
# call for each Plugin the loadPlugin() Methode
plugin = loadPlugin(i)
# Add it to globals.pluginList
globals.pluginList[i["name"]] = plugin
#call the .onLoad() routine for all active plugins
for pluginName, plugin in globals.pluginList.items():
logging.debug("call %s.onLoad()", pluginName)
# Try to call the .onLoad() routine for all active plugins
try:
plugin.onLoad(typ,freq,data)
logging.debug("call %s.onLoad()", i["name"])
plugin.onLoad()
# Add it to globals.pluginList
globals.pluginList[i["name"]] = plugin
except:
# call next plugin, if one has thrown an exception
logging.error("error calling %s.onLoad()", i["name"])
logging.debug("error calling %s.onLoad()", exc_info=True)
pass
except:
logging.exception("cannot load Plugins")
logging.error("cannot load Plugins")
logging.debug("cannot load Plugins", exc_info=True)
raise
def getPlugins():
@ -77,7 +78,9 @@ def getPlugins():
logging.warning("Plugin [NO CONF ] %s", i)
pass
except:
logging.exception("Error during Plugin search")
logging.error("Error during Plugin search")
logging.debug("cannot load Plugins", exc_info=True)
raise
return plugins
@ -97,4 +100,6 @@ def loadPlugin(plugin):
logging.debug("load Plugin: %s", plugin["name"])
return imp.load_module(plugin["name"], *plugin["info"])
except:
logging.exception("cannot load Plugin: %s", plugin["name"])
logging.error("cannot load Plugin: %s", plugin["name"])
logging.debug("cannot load Plugin: %s", plugin["name"], exc_info=True)
raise