summaryrefslogtreecommitdiffstats
path: root/src/verbose.h
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2016-05-24 11:24:47 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2016-05-24 12:25:46 +0200
commitbe4e0e2d3855ccbd3b683bfe6cc4c7f9d3254314 (patch)
treeb55f7955880a487485e2630073c1a6b4ca996486 /src/verbose.h
parentcd438c6c7074c9c279f15dd9e5c69b90b412b8a5 (diff)
add log macros for plugins
Change-Id: I3de30aeb90a41ed8ee63ec1e19c6032440d65574 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/verbose.h')
-rw-r--r--src/verbose.h42
1 files changed, 8 insertions, 34 deletions
diff --git a/src/verbose.h b/src/verbose.h
index 5c9f8864..3382d39f 100644
--- a/src/verbose.h
+++ b/src/verbose.h
@@ -18,45 +18,19 @@
#pragma once
-#if !defined(VERBOSE_WITH_SYSLOG)
+#include <stdarg.h>
- extern int verbosity;
- extern void verbose(int level, const char *file, int line, const char *fmt, ...);
+extern int verbosity;
+
+extern void verbose_set_name(const char *name, int authority);
+extern void verbose(int level, const char *file, int line, const char *fmt, ...);
+extern void vverbose(int level, const char *file, int line, const char *fmt, va_list args);
# define ERROR(...) do{if(verbosity>=0)verbose(3,__FILE__,__LINE__,__VA_ARGS__);}while(0)
# define WARNING(...) do{if(verbosity>=1)verbose(4,__FILE__,__LINE__,__VA_ARGS__);}while(0)
# define NOTICE(...) do{if(verbosity>=1)verbose(5,__FILE__,__LINE__,__VA_ARGS__);}while(0)
# define INFO(...) do{if(verbosity>=2)verbose(6,__FILE__,__LINE__,__VA_ARGS__);}while(0)
# define DEBUG(...) do{if(verbosity>=3)verbose(7,__FILE__,__LINE__,__VA_ARGS__);}while(0)
-# define LOGUSER(app) NOTICE("Starting user application %s",app)
-# define LOGAUTH(app) NOTICE("Starting auth application %s",app)
-
-#else /* VERBOSE_WITH_SYSLOG is defined */
-
-# include <syslog.h>
-
-# define LOGUSER(app) openlog(app,LOG_PERROR,LOG_USER)
-# define LOGAUTH(app) openlog(app,LOG_PERROR,LOG_AUTH)
-
-# if !defined(NDEBUG)
-
- extern int verbosity;
-# define ERROR(...) syslog(LOG_ERR,__VA_ARGS__)
-# define WARNING(...) do{if(verbosity)syslog(LOG_WARNING,__VA_ARGS__);}while(0)
-# define NOTICE(...) do{if(verbosity)syslog(LOG_NOTICE,__VA_ARGS__);}while(0)
-# define INFO(...) do{if(verbosity>1)syslog(LOG_INFO,__VA_ARGS__);}while(0)
-# define DEBUG(...) do{if(verbosity>2)syslog(LOG_DEBUG,__VA_ARGS__);}while(0)
-
-# else
-
- extern void verbose_error(const char *file, int line);
-# define ERROR(...) verbose_error(__FILE__,__LINE__)
-# define WARNING(...) do{/*nothing*/}while(0)
-# define NOTICE(...) do{/*nothing*/}while(0)
-# define INFO(...) do{/*nothing*/}while(0)
-# define DEBUG(...) do{/*nothing*/}while(0)
-
-# endif
-
-#endif
+# define LOGUSER(app) verbose_set_name(app,0)
+# define LOGAUTH(app) verbose_set_name(app,1)