diff options
| -rw-r--r-- | src/verbose.c | 44 | ||||
| -rw-r--r-- | src/verbose.h | 65 |
2 files changed, 85 insertions, 24 deletions
diff --git a/src/verbose.c b/src/verbose.c index 7e46a33..82de177 100644 --- a/src/verbose.c +++ b/src/verbose.c @@ -1,5 +1,5 @@ /* - Copyright 2015 IoT.bzh + Copyright 2016 IoT.bzh author: José Bollo <jose.bollo@iot.bzh> @@ -18,12 +18,50 @@ #include "verbose.h" -#if !defined(NDEBUG) +#if !defined(VERBOSE_WITH_SYSLOG) + +#include <stdio.h> +#include <stdarg.h> + +int verbosity = 1; + +static const char *prefixes[] = { + "<0> EMERGENCY", + "<1> ALERT", + "<2> CRITICAL", + "<3> ERROR", + "<4> WARNING", + "<5> NOTICE", + "<6> INFO", + "<7> DEBUG" +}; + +void verbose(int level, const char *file, int line, const char *fmt, ...) +{ + va_list ap; + + fprintf(stderr, "%s: ", prefixes[level < 0 ? 0 : level > 7 ? 7 : level]); + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fprintf(stderr, " [%s:%d]\n", file, line); +} + +#endif + +#if defined(VERBOSE_WITH_SYSLOG) && !defined(NDEBUG) + int verbosity = 1; -#else + +#endif + +#if defined(VERBOSE_WITH_SYSLOG) && defined(NDEBUG) + void verbose_error(const char *file, int line) { syslog(LOG_ERR, "error file %s line %d", file, line); } + #endif + diff --git a/src/verbose.h b/src/verbose.h index 7b32a66..ccd8eaf 100644 --- a/src/verbose.h +++ b/src/verbose.h @@ -1,5 +1,5 @@ /* - Copyright 2015 IoT.bzh + Copyright 2016 IoT.bzh author: José Bollo <jose.bollo@iot.bzh> @@ -16,24 +16,47 @@ limitations under the License. */ -#if !defined(NDEBUG) -#include <syslog.h> -extern int verbosity; -#define LOGUSER(app) openlog(app,LOG_PERROR,LOG_USER) -#define LOGAUTH(app) openlog(app,LOG_PERROR,LOG_AUTH) -#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 -#include <syslog.h> -#define LOGUSER(app) openlog(app,LOG_PERROR,LOG_USER) -#define LOGAUTH(app) openlog(app,LOG_PERROR,LOG_AUTH) -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) +#pragma once + +#if !defined(VERBOSE_WITH_SYSLOG) + + extern int verbosity; + extern void verbose(int level, const char *file, int line, const char *fmt, ...); + +# 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 + |