diff options
| -rw-r--r-- | src/verbose.c | 7 | ||||
| -rw-r--r-- | src/verbose.h | 26 |
2 files changed, 6 insertions, 27 deletions
diff --git a/src/verbose.c b/src/verbose.c index 7e46a333..3175cecb 100644 --- a/src/verbose.c +++ b/src/verbose.c @@ -18,12 +18,5 @@ #include "verbose.h" -#if !defined(NDEBUG) int verbosity = 1; -#else -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 25bd85b0..24479e5c 100644 --- a/src/verbose.h +++ b/src/verbose.h @@ -18,24 +18,10 @@ #pragma once -#if !defined(NDEBUG) -#include <syslog.h> +#include <systemd/sd-journal.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) -#endif +#define ERROR(...) do{if(verbosity>=0)sd_journal_print(LOG_ERR,__VA_ARGS__);}while(0) +#define WARNING(...) do{if(verbosity>=1)sd_journal_print(LOG_WARNING,__VA_ARGS__);}while(0) +#define NOTICE(...) do{if(verbosity>=0)sd_journal_print(LOG_NOTICE,__VA_ARGS__);}while(0) +#define INFO(...) do{if(verbosity>=2)sd_journal_print(LOG_INFO,__VA_ARGS__);}while(0) +#define DEBUG(...) do{if(verbosity>=3)sd_journal_print(LOG_DEBUG,__VA_ARGS__);}while(0) |