X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafm-binding.c;h=42d2baa1b92c00b7491ab8ae2c3d4b5c27fb1377;hb=2a319cf90daa6e3b01e8139923f7073e1c9bcf28;hp=dd59be9343dd6c7c6f33569c20892d777d3691f6;hpb=4709f00f2236f40c606cbd318eb4fecc8d4af924;p=src%2Fapp-framework-main.git

diff --git a/src/afm-binding.c b/src/afm-binding.c
index dd59be9..42d2baa 100644
--- a/src/afm-binding.c
+++ b/src/afm-binding.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2018 "IoT.bzh"
+ * Copyright (C) 2015-2019 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <assert.h>
 #include <signal.h>
+#include <errno.h>
 
 #include <json-c/json.h>
 
@@ -48,6 +49,7 @@ static const char _id_[]        = "id";
 static const char _install_[]   = "install";
 static const char _lang_[]      = "lang";
 static const char _not_found_[] = "not-found";
+static const char _not_running_[] = "not-running";
 static const char _once_[]      = "once";
 static const char _pause_[]     = "pause";
 static const char _resume_[]    = "resume";
@@ -186,6 +188,12 @@ static void not_found(afb_req_t req)
 	afb_req_fail(req, _not_found_, NULL);
 }
 
+/* common not running reply */
+static void not_running(afb_req_t req)
+{
+	afb_req_fail(req, _not_running_, NULL);
+}
+
 /* common can't start reply */
 static void cant_start(afb_req_t req)
 {
@@ -236,7 +244,7 @@ static int onappid(afb_req_t req, const char *method, const char **appid)
 
 	/* get the appid if any */
 	if (!wrap_json_unpack(json, "s", appid)
-	 || !wrap_json_unpack(json, "{si}", _id_, appid)) {
+	 || !wrap_json_unpack(json, "{ss}", _id_, appid)) {
 		/* found */
 		INFO("method %s called for %s", method, *appid);
 		return 1;
@@ -282,7 +290,10 @@ static int onrunid(afb_req_t req, const char *method, int *runid)
 		/* nothing appropriate */
 		INFO("method %s can't get runid for %s: %m", method,
 							appid);
-		not_found(req);
+		if (errno == ESRCH)
+			not_running(req);
+		else
+			not_found(req);
 		return 0;
 	}
 
@@ -295,21 +306,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 +440,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 +452,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 +464,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 +487,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);
 	}
 }