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
Remove returning token
[src/app-framework-binder.git]
/
src
/
afb-supervision.c
diff --git
a/src/afb-supervision.c
b/src/afb-supervision.c
index
b6af92c
..
df04580
100644
(file)
--- a/
src/afb-supervision.c
+++ b/
src/afb-supervision.c
@@
-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
@@
-41,7
+41,7
@@
#include "afb-xreq.h"
#include "afb-trace.h"
#include "afb-session.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-supervision.h"
#include "afs-supervision.h"
#include "afb-stub-ws.h"
@@
-53,7
+53,9
@@
/* api and apiset name */
static const char supervision_apiname[] = AFS_SUPERVISION_APINAME;
/* api and apiset name */
static const char supervision_apiname[] = AFS_SUPERVISION_APINAME;
+#if WITH_AFB_TRACE
static const char supervisor_apiname[] = AFS_SUPERVISOR_APINAME;
static const char supervisor_apiname[] = AFS_SUPERVISOR_APINAME;
+#endif
/* path of the supervision socket */
static const char supervisor_socket_path[] = AFS_SUPERVISION_SOCKET;
/* path of the supervision socket */
static const char supervisor_socket_path[] = AFS_SUPERVISION_SOCKET;
@@
-80,8
+82,10
@@
static struct afb_api_itf supervision_api_itf =
/* the supervisor link */
static struct afb_stub_ws *supervisor;
/* the supervisor link */
static struct afb_stub_ws *supervisor;
+#if WITH_AFB_TRACE
/* the trace api */
static struct afb_trace *trace;
/* the trace api */
static struct afb_trace *trace;
+#endif
/* open the socket */
static int open_supervisor_socket(const char *path)
/* open the socket */
static int open_supervisor_socket(const char *path)
@@
-121,15
+125,17
@@
static int open_supervisor_socket(const char *path)
static void disconnect_supervisor()
{
struct afb_stub_ws *s;
static void disconnect_supervisor()
{
struct afb_stub_ws *s;
- struct afb_trace *t;
INFO("Disconnecting supervision");
s = __atomic_exchange_n(&supervisor, NULL, __ATOMIC_RELAXED);
INFO("Disconnecting supervision");
s = __atomic_exchange_n(&supervisor, NULL, __ATOMIC_RELAXED);
- t = __atomic_exchange_n(&trace, NULL, __ATOMIC_RELAXED);
if (s)
afb_stub_ws_unref(s);
if (s)
afb_stub_ws_unref(s);
+
+#if WITH_AFB_TRACE
+ struct afb_trace *t = __atomic_exchange_n(&trace, NULL, __ATOMIC_RELAXED);
if (t)
afb_trace_unref(t);
if (t)
afb_trace_unref(t);
+#endif
}
static void on_supervisor_hangup(struct afb_stub_ws *s)
}
static void on_supervisor_hangup(struct afb_stub_ws *s)
@@
-286,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;
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);
}
/******************************************************************************
}
/******************************************************************************
@@
-302,12
+306,16
@@
enum { Break , Config , Do , Exit , Sclose , Slist , Trace , Wait };
static void on_supervision_call(void *closure, struct afb_xreq *xreq)
{
static void on_supervision_call(void *closure, struct afb_xreq *xreq)
{
- int i
, rc
;
- struct json_object *args, *
drop, *add, *
sub, *list;
+ int i;
+ struct json_object *args, *sub, *list;
const char *api, *verb, *uuid;
struct afb_session *session;
const struct afb_api_item *xapi;
afb_req_t req;
const char *api, *verb, *uuid;
struct afb_session *session;
const struct afb_api_item *xapi;
afb_req_t req;
+#if WITH_AFB_TRACE
+ struct json_object *drop, *add;
+ int rc;
+#endif
/* search the verb */
i = (int)(sizeof verbs / sizeof *verbs);
/* search the verb */
i = (int)(sizeof verbs / sizeof *verbs);
@@
-354,10
+362,11
@@
static void on_supervision_call(void *closure, struct afb_xreq *xreq)
afb_xreq_reply(xreq, json_object_get(global.config), NULL, NULL);
break;
case Trace:
afb_xreq_reply(xreq, json_object_get(global.config), NULL, NULL);
break;
case Trace:
+ req = xreq_to_req_x2(xreq);
+#if WITH_AFB_TRACE
if (!trace)
trace = afb_trace_create(supervisor_apiname, NULL /* not bound to any session */);
if (!trace)
trace = afb_trace_create(supervisor_apiname, NULL /* not bound to any session */);
- req = xreq_to_req_x2(xreq);
add = drop = NULL;
wrap_json_unpack(args, "{s?o s?o}", "add", &add, "drop", &drop);
if (add) {
add = drop = NULL;
wrap_json_unpack(args, "{s?o s?o}", "add", &add, "drop", &drop);
if (add) {
@@
-371,6
+380,9
@@
static void on_supervision_call(void *closure, struct afb_xreq *xreq)
return;
}
afb_req_success(req, NULL, NULL);
return;
}
afb_req_success(req, NULL, NULL);
+#else
+ afb_req_reply(req, NULL, "not-available", NULL);
+#endif
break;
case Do:
sub = NULL;
break;
case Do:
sub = NULL;