pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More error resilience during plugin loading

Browse source
This commit is contained in:
Gina Häußge 2014-09-11 12:17:45 +02:00
parent 56b1705df4
commit 5cd6ab9335
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/octoprint/plugin/core.py
View file

@ -181,15 +181,21 @@ class PluginManager(object):
return None
plugin = self._load_plugin(key, *module, version=version)
if plugin.check():
return plugin
else:
self.logger.warn("Plugin \"{plugin}\" did not pass check, disabling it".format(plugin=str(plugin)))
return None
if plugin:
if plugin.check():
return plugin
else:
self.logger.warn("Plugin \"{plugin}\" did not pass check, disabling it".format(plugin=str(plugin)))
return None
def _load_plugin(self, key, f, filename, description, version=None):
instance = imp.load_module(key, f, filename, description)
return PluginInfo(key, filename, instance, version=version)
try:
instance = imp.load_module(key, f, filename, description)
return PluginInfo(key, filename, instance, version=version)
except:
self.logger.exception("Error loading plugin {key}, disabling it".format(key=key))
return None
def _is_plugin_disabled(self, key):
return key in self.plugin_disabled_list or key.endswith('disabled')