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
Add gitreview file for Lucky Lamprey branch
[src/app-framework-binder.git]
/
src
/
afb-supervision.c
diff --git
a/src/afb-supervision.c
b/src/afb-supervision.c
index
6346201
..
6563d92
100644
(file)
--- a/
src/afb-supervision.c
+++ b/
src/afb-supervision.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 201
6-2019
"IoT.bzh"
+ * Copyright (C) 201
5-2020
"IoT.bzh"
* Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-15,7
+15,7
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#if
defined(WITH_SUPERVISION)
+#if
WITH_SUPERVISION
#define _GNU_SOURCE
#define _GNU_SOURCE
@@
-32,21
+32,22
@@
#include <json-c/json.h>
#define AFB_BINDING_VERSION 3
#include <json-c/json.h>
#define AFB_BINDING_VERSION 3
+#define AFB_BINDING_NO_ROOT
#include <afb/afb-binding.h>
#include <afb/afb-binding.h>
-#include "afb-cred.h"
#include "afb-api.h"
#include "afb-apiset.h"
#include "afb-api-so-v2.h"
#include "afb-xreq.h"
#include "afb-trace.h"
#include "afb-session.h"
#include "afb-api.h"
#include "afb-apiset.h"
#include "afb-api-so-v2.h"
#include "afb-xreq.h"
#include "afb-trace.h"
#include "afb-session.h"
-#include "afb-
config
.h"
+#include "afb-
args
.h"
#include "afb-supervision.h"
#include "afs-supervision.h"
#include "afb-stub-ws.h"
#include "afb-debug.h"
#include "afb-fdev.h"
#include "afb-supervision.h"
#include "afs-supervision.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"
@@
-161,14
+162,14
@@
static void try_connect_supervisor()
/* check existing path */
if (supervisor_socket_path[0] != '@' && access(supervisor_socket_path, F_OK)) {
/* check existing path */
if (supervisor_socket_path[0] != '@' && access(supervisor_socket_path, F_OK)) {
-
NOTICE
("Can't acces socket path %s: %m", supervisor_socket_path);
+
INFO
("Can't acces socket path %s: %m", supervisor_socket_path);
goto end;
}
/* socket connection */
fd = open_supervisor_socket(supervisor_socket_path);
if (fd < 0) {
goto end;
}
/* socket connection */
fd = open_supervisor_socket(supervisor_socket_path);
if (fd < 0) {
-
NOTICE
("Can't connect supervision socket to %s: %m", supervisor_socket_path);
+
INFO
("Can't connect supervision socket to %s: %m", supervisor_socket_path);
goto end;
}
goto end;
}
@@
-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,20
+382,19
@@
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)
afb_xreq_reply_unknown_api(xreq);
else {
else {
xapi = afb_apiset_lookup_started(global.apiset, api, 1);
if (!xapi)
afb_xreq_reply_unknown_api(xreq);
else {
- afb_cred_unref(xreq->cred);
- xreq->cred = NULL;
+ afb_context_change_cred(&xreq->context, NULL);
xreq->request.called_api = api;
xreq->request.called_verb = verb;
xreq->json = json_object_get(sub);
xreq->request.called_api = api;
xreq->request.called_verb = verb;
xreq->json = json_object_get(sub);