diff options
| -rw-r--r-- | src/verbose.c | 79 | ||||
| -rw-r--r-- | src/verbose.h | 44 |
2 files changed, 63 insertions, 60 deletions
diff --git a/src/verbose.c b/src/verbose.c index 82de177..a91aeb1 100644 --- a/src/verbose.c +++ b/src/verbose.c @@ -1,5 +1,5 @@ /* - Copyright 2016 IoT.bzh + Copyright (C) 2016 "IoT.bzh" author: José Bollo <jose.bollo@iot.bzh> @@ -16,15 +16,44 @@ limitations under the License. */ -#include "verbose.h" - -#if !defined(VERBOSE_WITH_SYSLOG) - #include <stdio.h> #include <stdarg.h> +#include "verbose.h" + int verbosity = 1; +#define LEVEL(x) ((x) < 0 ? 0 : (x) > 7 ? 7 : (x)) + +#if defined(VERBOSE_WITH_SYSLOG) + +#include <syslog.h> + +void vverbose(int level, const char *file, int line, const char *fmt, va_list args) +{ + char *p; + + if (file == NULL || vasprintf(&p, fmt, args) < 0) + vsyslog(level, fmt, args); + else { + syslog(LEVEL(level), "%s [%s:%d]", p, file, line); + free(p); + } +} + +void verbose_set_name(const char *name, int authority) +{ + openlog(name, LOG_PERROR, authority ? LOG_AUTH : LOG_USER); +} + +#else + +#include <unistd.h> + +static const char *appname; + +static int appauthority; + static const char *prefixes[] = { "<0> EMERGENCY", "<1> ALERT", @@ -36,32 +65,32 @@ static const char *prefixes[] = { "<7> DEBUG" }; -void verbose(int level, const char *file, int line, const char *fmt, ...) +void vverbose(int level, const char *file, int line, const char *fmt, va_list args) { - 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); + int tty = isatty(fileno(stderr)); + + fprintf(stderr, "%s: ", prefixes[LEVEL(level)] + (tty ? 4 : 0)); + vfprintf(stderr, fmt, args); + if (file != NULL && (!tty || verbosity >5)) + fprintf(stderr, " [%s:%d]\n", file, line); + else + fprintf(stderr, "\n"); } -#endif - -#if defined(VERBOSE_WITH_SYSLOG) && !defined(NDEBUG) - -int verbosity = 1; - -#endif - -#if defined(VERBOSE_WITH_SYSLOG) && defined(NDEBUG) - -void verbose_error(const char *file, int line) +void verbose_set_name(const char *name, int authority) { - syslog(LOG_ERR, "error file %s line %d", file, line); + appname = name; + appauthority = authority; } #endif +void verbose(int level, const char *file, int line, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vverbose(level, file, line, fmt, ap); + va_end(ap); +} diff --git a/src/verbose.h b/src/verbose.h index ccd8eaf..7e10d25 100644 --- a/src/verbose.h +++ b/src/verbose.h @@ -1,5 +1,5 @@ /* - Copyright 2016 IoT.bzh + Copyright (C) 2016 "IoT.bzh" author: José Bollo <jose.bollo@iot.bzh> @@ -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, ...) __attribute__((format(printf, 4, 5))); +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) |