From c02ae8ec5ec121e81ce6ab53d63ceb855470adca Mon Sep 17 00:00:00 2001 From: Tristan Matthews <le.businessman@gmail.com> Date: Sat, 28 Apr 2012 16:21:12 -0400 Subject: [PATCH] * #9832: new logging macros --- daemon/src/logger.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/daemon/src/logger.h b/daemon/src/logger.h index 353d4abb42..d8b9c1d25c 100644 --- a/daemon/src/logger.h +++ b/daemon/src/logger.h @@ -28,8 +28,8 @@ * as that of the covered work. */ -#ifndef __LOGGER_H__ -#define __LOGGER_H__ +#ifndef LOGGER_H_ +#define LOGGER_H_ #include <syslog.h> @@ -41,10 +41,17 @@ void setDebugMode(bool); bool getDebugMode(); }; -#define ERROR(...) Logger::log(LOG_ERR, __VA_ARGS__) -#define WARN(...) Logger::log(LOG_WARNING, __VA_ARGS__) -#define INFO(...) Logger::log(LOG_INFO, __VA_ARGS__) -#define DEBUG(...) Logger::log(LOG_DEBUG, __VA_ARGS__) +#ifdef NDEBUG +#define LOGGER(M, LEVEL, ...) +#else +#define LOGGER(M, LEVEL, ...) Logger::log(LEVEL, "%s:%d: " M "\n", __FILE__, \ + __LINE__, ##__VA_ARGS__) +#endif + +#define ERROR(M, ...) LOGGER(M, LOG_ERR, ##__VA_ARGS__) +#define WARN(M, ...) LOGGER(M, LOG_WARNING, ##__VA_ARGS__) +#define INFO(M, ...) LOGGER(M, LOG_INFO, ##__VA_ARGS__) +#define DEBUG(M, ...) LOGGER(M, LOG_DEBUG, ##__VA_ARGS__) #define BLACK "\033[22;30m" #define RED "\033[22;31m" @@ -64,5 +71,5 @@ bool getDebugMode(); #define WHITE "\033[01;37m" #define END_COLOR "\033[0m" -#endif +#endif // LOGGER_H_ -- GitLab