verbosity: split verbosity level 1 in 2 levels

[src/app-framework-binder.git] / include / afb / afb-binding-v2.h

diff --git a/include/afb/afb-binding-v2.h b/include/afb/afb-binding-v2.h
index 68e6f78..8831a43 100644 (file)
--- a/include/afb/afb-binding-v2.h
+++ b/include/afb/afb-binding-v2.h
@@ -36,9 +36,10 @@ struct json_object;
  */
 struct afb_verb_v2
 {
-       const char *verb;                       /* name of the verb */
+       const char *verb;                       /* name of the verb, NULL only at end of the array */
        void (*callback)(struct afb_req req);   /* callback function implementing the verb */
-       const struct afb_auth *auth;            /* required authorisation */
+       const struct afb_auth *auth;            /* required authorisation, can be NULL */
+       const char *info;                       /* some info about the verb, can be NULL */
        uint32_t session;                       /* authorisation and session requirements of the verb */
 };
 
@@ -48,7 +49,8 @@ struct afb_verb_v2
 struct afb_binding_v2
 {
        const char *api;                        /* api name for the binding */
-       const char *specification;              /* textual specification of the binding */
+       const char *specification;              /* textual specification of the binding, can be NULL */
+       const char *info;                       /* some info about the api, can be NULL */
        const struct afb_verb_v2 *verbs;        /* array of descriptions of verbs terminated by a NULL name */
        int (*preinit)();                       /* callback at load of the binding */
        int (*init)();                          /* callback for starting the service */
@@ -114,16 +116,17 @@ struct afb_binding_data_v2 AFB_BINDING_DATA_NAME_V2  __attribute__ ((weak));
                        afb_req_verbose(req,llevel,NULL,0,NULL,__VA_ARGS__); \
        }while(0)
 # endif
-# define AFB_ERROR_V2(...)       _AFB_LOGGING_V2_(0,3,__VA_ARGS__)
-# define AFB_WARNING_V2(...)     _AFB_LOGGING_V2_(1,4,__VA_ARGS__)
-# define AFB_NOTICE_V2(...)      _AFB_LOGGING_V2_(1,5,__VA_ARGS__)
-# define AFB_INFO_V2(...)        _AFB_LOGGING_V2_(2,6,__VA_ARGS__)
-# define AFB_DEBUG_V2(...)       _AFB_LOGGING_V2_(3,7,__VA_ARGS__)
-# define AFB_REQ_ERROR_V2(...)   _AFB_REQ_LOGGING_V2_(0,3,__VA_ARGS__)
-# define AFB_REQ_WARNING_V2(...) _AFB_REQ_LOGGING_V2_(1,4,__VA_ARGS__)
-# define AFB_REQ_NOTICE_V2(...)  _AFB_REQ_LOGGING_V2_(1,5,__VA_ARGS__)
-# define AFB_REQ_INFO_V2(...)    _AFB_REQ_LOGGING_V2_(2,6,__VA_ARGS__)
-# define AFB_REQ_DEBUG_V2(...)   _AFB_REQ_LOGGING_V2_(3,7,__VA_ARGS__)
+# include "afb-verbosity.h"
+# define AFB_ERROR_V2(...)       _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_ERROR,_AFB_SYSLOG_LEVEL_ERROR_,__VA_ARGS__)
+# define AFB_WARNING_V2(...)     _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_WARNING,_AFB_SYSLOG_LEVEL_WARNING_,__VA_ARGS__)
+# define AFB_NOTICE_V2(...)      _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_NOTICE,_AFB_SYSLOG_LEVEL_NOTICE_,__VA_ARGS__)
+# define AFB_INFO_V2(...)        _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_INFO,_AFB_SYSLOG_LEVEL_INFO_,__VA_ARGS__)
+# define AFB_DEBUG_V2(...)       _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_DEBUG,_AFB_SYSLOG_LEVEL_DEBUG_,__VA_ARGS__)
+# define AFB_REQ_ERROR_V2(...)   _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_ERROR,_AFB_SYSLOG_LEVEL_ERROR_,__VA_ARGS__)
+# define AFB_REQ_WARNING_V2(...) _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_WARNING,_AFB_SYSLOG_LEVEL_WARNING_,__VA_ARGS__)
+# define AFB_REQ_NOTICE_V2(...)  _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_NOTICE,_AFB_SYSLOG_LEVEL_NOTICE_,__VA_ARGS__)
+# define AFB_REQ_INFO_V2(...)    _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_INFO,_AFB_SYSLOG_LEVEL_INFO_,__VA_ARGS__)
+# define AFB_REQ_DEBUG_V2(...)   _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_DEBUG,_AFB_SYSLOG_LEVEL_DEBUG_,__VA_ARGS__)
 #endif
 
 #include "afb-daemon-v2.h"