diff --git a/Miracast/common/MiracastLogger.cpp b/Miracast/common/MiracastLogger.cpp index b5f22529..a99e7915 100644 --- a/Miracast/common/MiracastLogger.cpp +++ b/Miracast/common/MiracastLogger.cpp @@ -33,7 +33,7 @@ namespace MIRACAST setvbuf(stdout, NULL, _IOLBF, 0); } - static int gDefaultLogLevel = INFO_LEVEL; + static int gDefaultLogLevel = ERROR_LEVEL; static std::string service_name = "NOT-DEFINED"; void logger_init(const char* module_name) diff --git a/helpers/UtilsLogging.h b/helpers/UtilsLogging.h index 2fd3d7bf..ab04add3 100644 --- a/helpers/UtilsLogging.h +++ b/helpers/UtilsLogging.h @@ -21,9 +21,13 @@ #include -#define LOGINFO(fmt, ...) do { fprintf(stderr, "[%d] INFO [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); } while (0) -#define LOGWARN(fmt, ...) do { fprintf(stderr, "[%d] WARN [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); } while (0) -#define LOGERR(fmt, ...) do { fprintf(stderr, "[%d] ERROR [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); } while (0) +enum LogLevels {FATAL_LOGLEVEL = 0, ERROR_LOGLEVEL, WARNING_LOGLEVEL, INFO_LOGLEVEL, DEBUG_LOGLEVEL}; +static int defaultLogLevel = ERROR_LOGLEVEL; + +#define LOGDBG(fmt, ...) do { if(defaultLogLevel >= DEBUG_LOGLEVEL) { fprintf(stderr, "[%d] DEBUG [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) +#define LOGINFO(fmt, ...) do { if(defaultLogLevel >= INFO_LOGLEVEL) { fprintf(stderr, "[%d] INFO [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) +#define LOGWARN(fmt, ...) do { if(defaultLogLevel >= WARNING_LOGLEVEL) { fprintf(stderr, "[%d] WARN [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) +#define LOGERR(fmt, ...) do { if(defaultLogLevel>= ERROR_LOGLEVEL) { fprintf(stderr, "[%d] ERROR [%s:%d] %s: " fmt "\n", (int)syscall(SYS_gettid), WPEFramework::Core::FileNameOnly(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__); fflush(stderr); }} while (0) #define LOG_DEVICE_EXCEPTION0() LOGWARN("Exception caught: code=%d message=%s", err.getCode(), err.what()); #define LOG_DEVICE_EXCEPTION1(param1) LOGWARN("Exception caught" #param1 "=%s code=%d message=%s", param1.c_str(), err.getCode(), err.what());