Merge branch 'devel' into dev/pluginLifecycleMgmt
Conflicts: src/octoprint/plugin/core.py
This commit is contained in:
commit
f0b48a6b43
1 changed files with 2 additions and 3 deletions
|
|
@ -121,9 +121,7 @@ class PluginInfo(object):
|
|||
self._url = url
|
||||
self._license = license
|
||||
|
||||
self._validate()
|
||||
|
||||
def _validate(self):
|
||||
def validate(self):
|
||||
# if the plugin still uses __plugin_implementations__, log a deprecation warning and put the first
|
||||
# item into __plugin_implementation__
|
||||
if hasattr(self.instance, self.__class__.attr_implementations):
|
||||
|
|
@ -552,6 +550,7 @@ class PluginManager(object):
|
|||
def load_plugin(self, name, plugin):
|
||||
try:
|
||||
plugin.load()
|
||||
plugin.validate()
|
||||
self._activate_plugin(name, plugin)
|
||||
except:
|
||||
self.logger.exception("There was an error loading plugin %s" % name)
|
||||
|
|
|
|||
Loading…
Reference in a new issue