Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
afb-error-text: Introduce standard error text
[src/app-framework-binder.git]
/
src
/
afb-supervision.c
diff --git
a/src/afb-supervision.c
b/src/afb-supervision.c
index
1575ae2
..
0515234
100644
(file)
--- a/
src/afb-supervision.c
+++ b/
src/afb-supervision.c
@@
-47,6
+47,7
@@
#include "afb-stub-ws.h"
#include "afb-debug.h"
#include "afb-fdev.h"
#include "afb-stub-ws.h"
#include "afb-debug.h"
#include "afb-fdev.h"
+#include "afb-error-text.h"
#include "verbose.h"
#include "wrap-json.h"
#include "jobs.h"
#include "verbose.h"
#include "wrap-json.h"
#include "jobs.h"
@@
-292,10
+293,8
@@
int afb_supervision_init(struct afb_apiset *apiset, struct json_object *config)
static void slist(void *closure, struct afb_session *session)
{
struct json_object *list = closure;
static void slist(void *closure, struct afb_session *session)
{
struct json_object *list = closure;
- struct json_object *item;
- wrap_json_pack(&item, "{ss}", "token", afb_session_token(session));
- json_object_object_add(list, afb_session_uuid(session), item);
+ json_object_object_add(list, afb_session_uuid(session), NULL);
}
/******************************************************************************
}
/******************************************************************************
@@
-342,11
+341,11
@@
static void on_supervision_call(void *closure, struct afb_xreq *xreq)
if (wrap_json_unpack(args, "s", &uuid))
wrap_json_unpack(args, "{ss}", "uuid", &uuid);
if (!uuid)
if (wrap_json_unpack(args, "s", &uuid))
wrap_json_unpack(args, "{ss}", "uuid", &uuid);
if (!uuid)
- afb_xreq_reply(xreq, NULL,
"invalid"
, NULL);
+ afb_xreq_reply(xreq, NULL,
afb_error_text_invalid_request
, NULL);
else {
session = afb_session_search(uuid);
if (!session)
else {
session = afb_session_search(uuid);
if (!session)
- afb_xreq_reply(xreq, NULL,
"not-found"
, NULL);
+ afb_xreq_reply(xreq, NULL,
afb_error_text_unknown_session
, NULL);
else {
afb_session_close(session);
afb_session_unref(session);
else {
afb_session_close(session);
afb_session_unref(session);
@@
-383,13
+382,13
@@
static void on_supervision_call(void *closure, struct afb_xreq *xreq)
}
afb_req_success(req, NULL, NULL);
#else
}
afb_req_success(req, NULL, NULL);
#else
- afb_req_reply(req, NULL,
"not-available"
, NULL);
+ afb_req_reply(req, NULL,
afb_error_text_not_available
, NULL);
#endif
break;
case Do:
sub = NULL;
if (wrap_json_unpack(args, "{ss ss s?o*}", "api", &api, "verb", &verb, "args", &sub))
#endif
break;
case Do:
sub = NULL;
if (wrap_json_unpack(args, "{ss ss s?o*}", "api", &api, "verb", &verb, "args", &sub))
- afb_xreq_reply(xreq, NULL,
"error", "bad request"
);
+ afb_xreq_reply(xreq, NULL,
afb_error_text_invalid_request, NULL
);
else {
xapi = afb_apiset_lookup_started(global.apiset, api, 1);
if (!xapi)
else {
xapi = afb_apiset_lookup_started(global.apiset, api, 1);
if (!xapi)