3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moonraker: handle "prefix" section during inital load 

Only load the plugin for each prefix section once.  Plugins themselves will be responsible for parsing the configuration from each prefix section.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-11-14 06:15:08 -05:00
parent d18fc889d5
commit 0a7b580799
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
moonraker/moonraker.py
View File

@ -100,7 +100,7 @@ class Server:
self.load_plugin(config, plugin) self.load_plugin(config, plugin)
# check for optional plugins # check for optional plugins
opt_sections = set(config.sections()) - \ opt_sections = set([s.split()[0] for s in config.sections()]) - \
set(['server', 'authorization', 'cmd_args']) set(['server', 'authorization', 'cmd_args'])
for section in opt_sections: for section in opt_sections:
self.load_plugin(config, section, None) self.load_plugin(config, section, None)
@ -119,9 +119,12 @@ class Server:
return default return default
module = importlib.import_module("plugins." + plugin_name) module = importlib.import_module("plugins." + plugin_name)
try: try:
if plugin_name not in CORE_PLUGINS: func_name = "load_plugin"
if hasattr(module, "load_plugin_multi"):
func_name = "load_plugin_multi"
if plugin_name not in CORE_PLUGINS and func_name == "load_plugin":
config = config[plugin_name] config = config[plugin_name]
load_func = getattr(module, "load_plugin") load_func = getattr(module, func_name)
plugin = load_func(config) plugin = load_func(config)
except Exception: except Exception:
msg = f"Unable to load plugin ({plugin_name})" msg = f"Unable to load plugin ({plugin_name})"