Add logging by request

Change-Id: I6dda714bcb8c36392c14a1981cfb8960f3db45b8
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

4 files changed, 75 insertions, 3 deletions

diff --git a/src/afb-hook.c b/src/afb-hook.c
index cade990c..6afcd2fb 100644
--- a/src/afb-hook.c
+++ b/src/afb-hook.c
@@ -210,6 +210,24 @@ static void hook_xreq_subcallsync_result_default_cb(void * closure, const struct
 	_hook_xreq_(xreq, "    ...subcallsync... -> %d: %s", status, json_object_to_json_string(result));
 }
 
+static void hook_xreq_vverbose_default_cb(void * closure, const struct afb_xreq *xreq, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+	int len;
+	char *msg;
+	va_list ap;
+
+	va_copy(ap, args);
+	len = vasprintf(&msg, fmt, ap);
+	va_end(ap);
+
+	if (len < 0)
+		_hook_xreq_(xreq, "vverbose(%d, %s, %d, %s) -> %s ? ? ?", level, file, line, func, fmt);
+	else {
+		_hook_xreq_(xreq, "vverbose(%d, %s, %d, %s) -> %s", level, file, line, func, msg);
+		free(msg);
+	}
+}
+
 static struct afb_hook_xreq_itf hook_xreq_default_itf = {
 	.hook_xreq_begin = hook_xreq_begin_default_cb,
 	.hook_xreq_end = hook_xreq_end_default_cb,
@@ -229,6 +247,7 @@ static struct afb_hook_xreq_itf hook_xreq_default_itf = {
 	.hook_xreq_subcall_result = hook_xreq_subcall_result_default_cb,
 	.hook_xreq_subcallsync = hook_xreq_subcallsync_default_cb,
 	.hook_xreq_subcallsync_result = hook_xreq_subcallsync_result_default_cb,
+	.hook_xreq_vverbose = hook_xreq_vverbose_default_cb
 };
 
 /******************************************************************************
@@ -349,6 +368,11 @@ int afb_hook_xreq_subcallsync_result(const struct afb_xreq *xreq, int status, st
 	return status;
 }
 
+void afb_hook_xreq_vverbose(const struct afb_xreq *xreq, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+	_HOOK_XREQ_(vverbose, xreq, level, file ?: "?", line, func ?: "?", fmt, args);
+}
+
 /******************************************************************************
  * section: hooking xreqs
  *****************************************************************************/
diff --git a/src/afb-hook.h b/src/afb-hook.h
index 8fe30d5b..c1ff8476 100644
--- a/src/afb-hook.h
+++ b/src/afb-hook.h
@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include <stdarg.h>
+
 struct req;
 struct afb_context;
 struct json_object;
@@ -53,6 +55,7 @@ struct afb_hook_xreq;
 #define afb_hook_flag_req_subcall_result	0x010800
 #define afb_hook_flag_req_subcallsync		0x020000
 #define afb_hook_flag_req_subcallsync_result	0x040000
+#define afb_hook_flag_req_vverbose		0x080000
 
 /* common flags */
 #define afb_hook_flags_req_life		(afb_hook_flag_req_begin|afb_hook_flag_req_end)
@@ -69,7 +72,8 @@ struct afb_hook_xreq;
 
 /* predefined groups */
 #define afb_hook_flags_req_common	(afb_hook_flags_req_life|afb_hook_flags_req_args|afb_hook_flags_req_result\
-					|afb_hook_flags_req_session|afb_hook_flags_req_event|afb_hook_flags_req_subcall)
+					|afb_hook_flags_req_session|afb_hook_flags_req_event|afb_hook_flags_req_subcall\
+					|afb_hook_flag_req_vverbose)
 #define afb_hook_flags_req_extra	(afb_hook_flags_req_common|afb_hook_flags_req_ref|afb_hook_flags_req_context)
 #define afb_hook_flags_req_all		(afb_hook_flags_req_extra)
 
@@ -92,6 +96,7 @@ struct afb_hook_xreq_itf {
 	void (*hook_xreq_subcall_result)(void * closure, const struct afb_xreq *xreq, int status, struct json_object *result);
 	void (*hook_xreq_subcallsync)(void * closure, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args);
 	void (*hook_xreq_subcallsync_result)(void * closure, const struct afb_xreq *xreq, int status, struct json_object *result);
+	void (*hook_xreq_vverbose)(void * closure, const struct afb_xreq *xreq, int level, const char *file, int line, const char *func, const char *fmt, va_list args);
 };
 
 extern void afb_hook_init_xreq(struct afb_xreq *xreq);
@@ -119,6 +124,7 @@ extern void afb_hook_xreq_subcall(const struct afb_xreq *xreq, const char *api,
 extern void afb_hook_xreq_subcall_result(const struct afb_xreq *xreq, int status, struct json_object *result);
 extern void afb_hook_xreq_subcallsync(const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args);
 extern int afb_hook_xreq_subcallsync_result(const struct afb_xreq *xreq, int status, struct json_object *result);
+extern void afb_hook_xreq_vverbose(const struct afb_xreq *xreq, int level, const char *file, int line, const char *func, const char *fmt, va_list args);
 
 /*********************************************************
 * section hooking ditf (daemon interface)
diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 0b828277..61ba4fd9 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -257,6 +257,12 @@ static int xreq_subcallsync_cb(void *closure, const char *api, const char *verb,
 	return 1;
 }
 
+static void xreq_vverbose_cb(void*closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+	/* TODO: improves the implementation. example: on condition make a list of log messages that will be returned */
+	vverbose(level, file, line, func, fmt, args);
+}
+
 /******************************************************************************/
 
 static struct json_object *xreq_hooked_json_cb(void *closure)
@@ -397,6 +403,16 @@ static int xreq_hooked_subcallsync_cb(void *closure, const char *api, const char
 	return afb_hook_xreq_subcallsync_result(xreq, r, *result);
 }
 
+static void xreq_hooked_vverbose_cb(void*closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+	struct afb_xreq *xreq = closure;
+	va_list ap;
+	va_copy(ap, args);
+	xreq_vverbose_cb(closure, level, file, line, func, fmt, args);
+	afb_hook_xreq_vverbose(xreq, level, file, line, func, fmt, ap);
+	va_end(ap);
+}
+
 /******************************************************************************/
 
 const struct afb_req_itf xreq_itf = {
@@ -415,7 +431,8 @@ const struct afb_req_itf xreq_itf = {
 	.subscribe = xreq_subscribe_cb,
 	.unsubscribe = xreq_unsubscribe_cb,
 	.subcall = xreq_subcall_cb,
-	.subcallsync = xreq_subcallsync_cb
+	.subcallsync = xreq_subcallsync_cb,
+	.vverbose = xreq_vverbose_cb
 };
 
 const struct afb_req_itf xreq_hooked_itf = {
@@ -434,7 +451,8 @@ const struct afb_req_itf xreq_hooked_itf = {
 	.subscribe = xreq_hooked_subscribe_cb,
 	.unsubscribe = xreq_hooked_unsubscribe_cb,
 	.subcall = xreq_hooked_subcall_cb,
-	.subcallsync = xreq_hooked_subcallsync_cb
+	.subcallsync = xreq_hooked_subcallsync_cb,
+	.vverbose = xreq_hooked_vverbose_cb
 };
 
 static inline struct afb_req to_req(struct afb_xreq *xreq)
diff --git a/src/verbose.h b/src/verbose.h
index 71d5fe1e..6bedc323 100644
--- a/src/verbose.h
+++ b/src/verbose.h
@@ -20,9 +20,33 @@
 
 #include <stdarg.h>
 
+/*
+  verbosity tune the count of reported messages
+
+   verbosity value : reported messages
+   ----------------+------------------------
+    lesser than 0  : no message at all
+         0         : ERROR
+         1         : ERROR, WARNING, NOTICE
+         2         : ERROR, WARNING, NOTICE, INFO
+    greater than 2 : ERROR, WARNING, NOTICE, INFO, DEBUG
+
+*/
 extern int verbosity;
 
 extern void verbose_set_name(const char *name, int authority);
+
+/*
+ Level is defined by syslog standard:
+       KERN_EMERG             0        System is unusable
+       KERN_ALERT             1        Action must be taken immediately
+       KERN_CRIT              2        Critical conditions
+       KERN_ERR               3        Error conditions
+       KERN_WARNING           4        Warning conditions
+       KERN_NOTICE            5        Normal but significant condition
+       KERN_INFO              6        Informational
+       KERN_DEBUG             7        Debug-level messages
+*/
 extern void verbose(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__((format(printf, 5, 6)));
 extern void vverbose(int level, const char *file, int line, const char *function, const char *fmt, va_list args);