Update copyright dates

[src/app-framework-binder.git] / src / afb-supervision.c

diff --git a/src/afb-supervision.c b/src/afb-supervision.c
index 1575ae2..211c3fd 100644 (file)
--- a/src/afb-supervision.c
+++ b/src/afb-supervision.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,7 +34,6 @@
 #define AFB_BINDING_VERSION 3
 #include <afb/afb-binding.h>
 
-#include "afb-cred.h"
 #include "afb-api.h"
 #include "afb-apiset.h"
 #include "afb-api-so-v2.h"
@@ -47,6 +46,7 @@
 #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"
@@ -161,14 +161,14 @@ static void try_connect_supervisor()
 
        /* 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) {
-               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;
        }
 
@@ -292,10 +292,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;
-       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 +340,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)
-                       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)
-                               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);
@@ -383,20 +381,19 @@ static void on_supervision_call(void *closure, struct afb_xreq *xreq)
                }
                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))
-                       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 {
-                               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);