diff options
author | José Bollo <jose.bollo@iot.bzh> | 2017-12-18 12:26:41 +0100 |
---|---|---|
committer | José Bollo <jose.bollo@iot.bzh> | 2018-01-19 10:08:08 +0100 |
commit | bd910c758e234e165f6a3239c14e77f53d1fc480 (patch) | |
tree | ef4a6ac3bf3e9eb84ccce958b0b0376a2b48935e /src/afm-binding.c | |
parent | 66817a088f7b3ccd85117bfe6a610710a728ef09 (diff) |
afm-binding: Allow use of appid instead of runid
This facility avoid the double call 'ps', 'kill' and
allow a single call to 'kill' with the application id.
Bug-AGL: SPEC-1189
Change-Id: I71861c06847e855b05dc8294ab1ea6785f555416
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afm-binding.c')
-rw-r--r-- | src/afm-binding.c | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/src/afm-binding.c b/src/afm-binding.c index 51316e7..7fe9f3d 100644 --- a/src/afm-binding.c +++ b/src/afm-binding.c @@ -130,17 +130,34 @@ static int onappid(struct afb_req req, const char *method, const char **appid) static int onrunid(struct afb_req req, const char *method, int *runid) { struct json_object *json; + const char *appid; + /* get the paramaters of the request */ json = afb_req_json(req); - if (wrap_json_unpack(json, "i", runid) - && wrap_json_unpack(json, "{si}", _runid_, runid)) { - INFO("bad request method %s: %s", method, - json_object_to_json_string(json)); - bad_request(req); + + /* get the runid if any */ + if (!wrap_json_unpack(json, "i", runid) + || !wrap_json_unpack(json, "{si}", _runid_, runid)) { + INFO("method %s called for %d", method, *runid); + return 1; + } + + /* get the appid if any */ + if (!onappid(req, method, &appid)) + return 0; + + /* search the runid of the appid */ + *runid = afm_urun_search_runid(afudb, appid, afb_req_get_uid(req)); + if (*runid < 0) { + /* nothing appropriate */ + INFO("method %s can't get runid for %s: %m", method, + appid); + not_found(req); return 0; } - INFO("method %s called for %d", method, *runid); + /* found */ + INFO("method %s called for %s -> %d", method, appid, *runid); return 1; } |