summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Marec <frederic.marec@iot.bzh>2018-11-28 10:22:45 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2018-12-13 11:33:40 +0100
commit2ab1ba4ff446c58664b9c69bd0110ea542617c8e (patch)
tree5aff5e8856d628c0539ea25aeb68afb7b0d4b634
parent84ca481d0540e4fef1bd427936c8a804d1584761 (diff)
Bump app-controller-submodule
Fix plugins loading after app-controller-submodule modification Now plugins are holded in the controller configuration structure. Submodule app-controller-submodule ce07538...303022b: > Reworked pluginConfig function > Retrieve plugin list from api rather than a global > Add setter/getter for user free defined pointer > Pass the plugin to action. > Abort if one required API is missing > Correct an error when no plugins are defined > Decrease print level when no onload action > Add a 'params' fields for controller plugins > Call wasn't done correctly in 'CtlConfigExec' < Abort if one required API is missing > Add an Init step to the plugins load < Correct an error when no plugins are defined < Decrease print level when no onload action < Add a 'params' fields for controller plugins < Call wasn't done correctly in 'CtlConfigExec' > Add ctlPlugins array to the ctlConfig structure < Add ctlPlugins array to the ctlConfig structure < Add an Init step to the plugins load > Add gitreview file for flounder branch Change-Id: Ifd93d20bbff336420f478229f640d8304b502fc4 Signed-off-by: Frederic Marec <frederic.marec@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
m---------app-controller-submodule0
-rw-r--r--src/mapis.c2
2 files changed, 2 insertions, 0 deletions
diff --git a/app-controller-submodule b/app-controller-submodule
-Subproject ce075383309a30bb7084309014c7f1c2f699bf0
+Subproject 303022b794410a69daeb47e20a87fe7625b1870
diff --git a/src/mapis.c b/src/mapis.c
index fbe3e68..c356208 100644
--- a/src/mapis.c
+++ b/src/mapis.c
@@ -33,6 +33,8 @@ static int LoadOneMapi(void *data, afb_api_t apiHandle) {
struct mapisHandleT *mapisHandle = (struct mapisHandleT*)data;
CtlConfigT *ctrlConfig = afb_api_get_userdata(mapisHandle->mainApiHandle);
+ afb_api_set_userdata(apiHandle, ctrlConfig);
+
if(PluginConfig(apiHandle, mapisHandle->section, mapisHandle->mapiJ)) {
AFB_API_ERROR(apiHandle, "Problem loading the plugin as an API for %s, see log message above", json_object_get_string(mapisHandle->mapiJ));
return -1;