From 7138e18c162f9246079fbb077d38f7796314b6b0 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Sun, 16 Sep 2018 02:38:26 +0200 Subject: Handle errors on signal initialization This reports errors at signals getSignals action call and removed incorrect signals from the source. This allows the binding to correctly respond to the user if there was an error in its signal definitions. Change-Id: I7779ab9339a979fcb2b7b41f8ebf4aa27b8af3a1 Signed-off-by: Romain Forlot --- signal-composer-binding/signal-composer-binding.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'signal-composer-binding/signal-composer-binding.cpp') diff --git a/signal-composer-binding/signal-composer-binding.cpp b/signal-composer-binding/signal-composer-binding.cpp index 5932640..310cb40 100644 --- a/signal-composer-binding/signal-composer-binding.cpp +++ b/signal-composer-binding/signal-composer-binding.cpp @@ -211,13 +211,19 @@ void addObjects(afb_req request) if(sourcesJ && composer.loadSources(sourcesJ)) { - afb_req_fail_f(request, "Loading 'sources' configuration or subscription error", "Error code: -2"); + afb_req_fail_f(request, "Loading 'sources' configuration or subscription error", "Error code: -4"); return; } if(signalsJ) { if(!composer.loadSignals(signalsJ)) - {composer.initSignals();} + { + if(composer.initSignals()) + { + afb_req_fail_f(request, "Loading 'signals' configuration or subscription error", "Error code: -3"); + return; + } + } else { afb_req_fail_f(request, "Loading 'signals' configuration or subscription error", "Error code: -2"); -- cgit 1.2.3-korg