From bceaf2cc403176fd808d4e00be893671be3f4bb0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
Date: Wed, 31 Oct 2018 14:06:07 +0100
Subject: [PATCH] afm-system-daemon: Improve error message report
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Bug-AGL: SPEC-1872

Change-Id: I6e48baa05312b1490edd38ccf9231afe4aa6eb51
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
 src/afm-binding.c    | 21 +++++++++++----------
 src/wgtpkg-install.c |  4 +++-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/afm-binding.c b/src/afm-binding.c
index dd59be9..5fb1f73 100644
--- a/src/afm-binding.c
+++ b/src/afm-binding.c
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <assert.h>
 #include <signal.h>
+#include <errno.h>
 
 #include <json-c/json.h>
 
@@ -295,21 +296,21 @@ static int onrunid(afb_req_t req, const char *method, int *runid)
  * Sends the reply 'resp' to the request 'req' if 'resp' is not NULLzero.
  * Otherwise, when 'resp' is NULL replies the error string 'errstr'.
  */
-static void reply(afb_req_t req, struct json_object *resp, const char *errstr)
+static void reply(afb_req_t req, struct json_object *resp)
 {
-	if (!resp)
-		afb_req_fail(req, errstr, NULL);
+	if (resp)
+		afb_req_reply(req, resp, NULL, NULL);
 	else
-		afb_req_success(req, resp, NULL);
+		afb_req_reply(req, NULL, "failed", strerror(errno));
 }
 
 /*
  * Sends the reply "true" to the request 'req' if 'status' is zero.
  * Otherwise, when 'status' is not zero replies the error string 'errstr'.
  */
-static void reply_status(afb_req_t req, int status, const char *errstr)
+static void reply_status(afb_req_t req, int status)
 {
-	reply(req, status ? NULL : json_object_get(json_true), errstr);
+	reply(req, status ? NULL : json_object_get(json_true));
 }
 
 /*
@@ -429,7 +430,7 @@ static void pause(afb_req_t req)
 	int runid, status;
 	if (onrunid(req, "pause", &runid)) {
 		status = afm_urun_pause(runid, afb_req_get_uid(req));
-		reply_status(req, status, _not_found_);
+		reply_status(req, status);
 	}
 }
 
@@ -441,7 +442,7 @@ static void resume(afb_req_t req)
 	int runid, status;
 	if (onrunid(req, "resume", &runid)) {
 		status = afm_urun_resume(runid, afb_req_get_uid(req));
-		reply_status(req, status, _not_found_);
+		reply_status(req, status);
 	}
 }
 
@@ -453,7 +454,7 @@ static void terminate(afb_req_t req)
 	int runid, status;
 	if (onrunid(req, "terminate", &runid)) {
 		status = afm_urun_terminate(runid, afb_req_get_uid(req));
-		reply_status(req, status, _not_found_);
+		reply_status(req, status);
 	}
 }
 
@@ -476,7 +477,7 @@ static void state(afb_req_t req)
 	struct json_object *resp;
 	if (onrunid(req, "state", &runid)) {
 		resp = afm_urun_state(afudb, runid, afb_req_get_uid(req));
-		reply(req, resp, _not_found_);
+		reply(req, resp);
 	}
 }
 
diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index 5e8b0e9..31ef7c4 100644
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.c
@@ -503,7 +503,7 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force
 	struct wgt_info *ifo;
 	const struct wgt_desc *desc;
 	char installdir[PATH_MAX];
-	int port;
+	int port, err;
 	struct unitconf uconf;
 
 	NOTICE("-- INSTALLING widget %s to %s --", wgtfile, root);
@@ -578,7 +578,9 @@ error3:
 	wgt_info_unref(ifo);
 
 error2:
+	err = errno;
 	remove_workdir();
+	errno = err;
 
 error1:
 	file_reset();
-- 
2.16.6