summaryrefslogtreecommitdiffstats
path: root/ctl-lib/ctl-control.c
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-08-29 14:03:05 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-09-06 10:36:22 +0200
commitd6eb01e14f2340c950ff8476d7b112f91297aae2 (patch)
tree31549f90a6fc5377d775ee6438f10e341348b191 /ctl-lib/ctl-control.c
parentc3a70d7718d51f2266ce671ee112a25398df0765 (diff)
Change loading configuration object behaviorflounder_5.99.6flounder/5.99.65.99.6
This changes the default behavior when loading actions. Now, it appends the new actions to the old ones instead of replacing them when called several times. If there were no actions previously loaded then it just loads normally the actions. Change-Id: Ica58a3edf4a9bf18ae31c6b6a5fa329e7ec5478b Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'ctl-lib/ctl-control.c')
-rw-r--r--ctl-lib/ctl-control.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/ctl-lib/ctl-control.c b/ctl-lib/ctl-control.c
index 0605d6b..b28ff4c 100644
--- a/ctl-lib/ctl-control.c
+++ b/ctl-lib/ctl-control.c
@@ -24,15 +24,12 @@
// onload section receive one action or an array of actions
int ControlConfig(AFB_ApiT apiHandle, CtlSectionT *section, json_object *actionsJ) {
-
- // Load time parse actions in config file
- if (actionsJ != NULL) {
- section->actions= ActionConfig(apiHandle, actionsJ, 1);
-
- if (!section->actions) {
- AFB_ApiError (apiHandle, "ControlLoad config fail processing onload actions");
- return 1;
+ int err = 0;
+ if (actionsJ) {
+ if ( (err= AddActionsToSection(apiHandle, section, actionsJ, 1)) ) {
+ AFB_ApiError (apiHandle, "ControlLoad config fail processing actions for section %s", section->uid);
+ return err;
}
}
- return 0;
+ return err;
}