From f77128922406c2ea9249343b1f2d481704afd0ce Mon Sep 17 00:00:00 2001 From: Manuel83 Date: Thu, 31 Aug 2017 18:42:02 +0200 Subject: [PATCH] Loading all plugins before calling initializer methods. Now also initializer which are defined in the plugin will be called. Before these initializer where ignored. --- modules/__init__.py | 4 +++- modules/addon/endpoints.py | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/__init__.py b/modules/__init__.py index 96b5400..bf9d008 100755 --- a/modules/__init__.py +++ b/modules/__init__.py @@ -29,7 +29,7 @@ import modules.sensors import modules.actor import modules.notification import modules.fermenter -import modules.addon +from modules.addon.endpoints import initPlugins import modules.ui import modules.system import modules.buzzer @@ -37,6 +37,7 @@ import modules.stats import modules.kettle import modules.recipe_import import modules.core.db_mirgrate + from app_config import cbpi # Build the database: # This will create the database file using SQLAlchemy @@ -59,6 +60,7 @@ def init_db(): pass init_db() +initPlugins() cbpi.run_init() cbpi.run_background_processes() diff --git a/modules/addon/endpoints.py b/modules/addon/endpoints.py index 9da4639..83397b9 100644 --- a/modules/addon/endpoints.py +++ b/modules/addon/endpoints.py @@ -188,9 +188,8 @@ def loadPlugins(): cbpi.notify("Failed to load plugin %s " % filename, str(e), type="danger", timeout=None) cbpi.app.logger.error(e) -@cbpi.initalizer(order=1) -def initPlugins(app): - +#@cbpi.initalizer(order=1) +def initPlugins(): loadCorePlugins() loadPlugins()