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 <romain.forlot@iot.bzh>

1 files changed, 26 insertions, 4 deletions

diff --git a/signal-composer-binding/source.cpp b/signal-composer-binding/source.cpp
index bd988c9..939e3f6 100644
--- a/signal-composer-binding/source.cpp
+++ b/signal-composer-binding/source.cpp
@@ -141,8 +141,25 @@ std::vector<std::shared_ptr<Signal>> SourceAPI::searchSignals(const std::string&
 	return signals;
 }
 
-void SourceAPI::makeSubscription()
+int SourceAPI::cleanNotSubscribedSignals() {
+	int erased = 0;
+	for(auto sig = signalsM_.begin(); sig != signalsM_.end();)
+	{
+		if(!sig->second->subscribed_)
+		{
+			sig = signalsM_.erase(sig);
+			erased++;
+		}
+		else
+			{sig++;}
+	}
+
+	return erased;
+}
+
+int SourceAPI::makeSubscription()
 {
+	int err = 0;
 	if(getSignals_)
 	{
 		CtlSourceT source;
@@ -168,13 +185,18 @@ void SourceAPI::makeSubscription()
 				getSignals_->argsJ = sig.second->getSignalsArgs() ?
 					sig.second->getSignalsArgs() :
 					argsSaveJ;
-				ActionExecOne(&source, getSignals_, signalJ);
-				// Considerate signal subscribed no matter what
-				sig.second->subscribed_ = true;
+
+				sig.second->subscribed_ = ActionExecOne(&source, getSignals_, signalJ) ? false : true;
 			}
 		}
+		err += cleanNotSubscribedSignals();
 		getSignals_->argsJ = argsSaveJ;
 		source.uid = uid_.c_str();
 		ActionExecOne(&source, getSignals_, nullptr);
 	}
+
+	if(err)
+		{AFB_ERROR("%d signal(s) removed because invalid. Please review your signal definition.", err);}
+
+	return err;
 }