diff --git a/Miracast/common/MiracastLogger.cpp b/Miracast/common/MiracastLogger.cpp index 70e51626b3..c95d66cbfc 100644 --- a/Miracast/common/MiracastLogger.cpp +++ b/Miracast/common/MiracastLogger.cpp @@ -43,7 +43,7 @@ namespace MIRACAST return prettyFunction.substr(begin, end); } - static int gDefaultLogLevel = INFO_LEVEL; + static int gDefaultLogLevel = ERROR_LEVEL; static FILE *logger_file_ptr = nullptr; static std::string service_name = "NOT-DEFINED"; static sem_t separate_logger_sync; diff --git a/SystemAudioPlayer/impl/logger.cpp b/SystemAudioPlayer/impl/logger.cpp index a26219a713..835c124cba 100644 --- a/SystemAudioPlayer/impl/logger.cpp +++ b/SystemAudioPlayer/impl/logger.cpp @@ -93,7 +93,7 @@ namespace SAP { #else - static int gDefaultLogLevel = INFO_LEVEL; + static int gDefaultLogLevel = ERROR_LEVEL; // static int gDefaultLogLevel = VERBOSE_LEVEL; void logger_init() diff --git a/TextToSpeech/impl/logger.cpp b/TextToSpeech/impl/logger.cpp index 6078f3b630..38b3aede9c 100644 --- a/TextToSpeech/impl/logger.cpp +++ b/TextToSpeech/impl/logger.cpp @@ -93,7 +93,7 @@ namespace TTS { #else - static int gDefaultLogLevel = INFO_LEVEL; + static int gDefaultLogLevel = ERROR_LEVEL; // static int gDefaultLogLevel = VERBOSE_LEVEL; void logger_init() diff --git a/helpers/UtilsLogging.h b/helpers/UtilsLogging.h index 5e1b09a656..4682041e18 100644 --- a/helpers/UtilsLogging.h +++ b/helpers/UtilsLogging.h @@ -2,9 +2,24 @@ #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; + +namespace { + template + const T* UNUSED_GLOBAL_VARIABLE_HELPER(const T& dummy) { + return &dummy; + } + + static const auto UNUSED_GLOBAL_VARIABLE_DefaultLogLevel = + UNUSED_GLOBAL_VARIABLE_HELPER(DefaultLogLevel); +} + +#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());