Commit 4fdcfa5b authored by Dominik Charousset's avatar Dominik Charousset Committed by GitHub

Merge pull request #489 from alexeiz/develop

Respect CAF_LOG_LEVEL
parents aa516656 e7c0fe22
...@@ -274,11 +274,32 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; } ...@@ -274,11 +274,32 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; }
#endif // CAF_LOG_LEVEL < CAF_LOG_LEVEL_TRACE #endif // CAF_LOG_LEVEL < CAF_LOG_LEVEL_TRACE
#if CAF_LOG_LEVEL >= CAF_LOG_LEVEL_DEBUG
# define CAF_LOG_DEBUG(output) CAF_LOG_IMPL(CAF_LOG_LEVEL_DEBUG, output)
#endif
#if CAF_LOG_LEVEL >= CAF_LOG_LEVEL_INFO
# define CAF_LOG_INFO(output) CAF_LOG_IMPL(CAF_LOG_LEVEL_INFO, output)
#endif
#if CAF_LOG_LEVEL >= CAF_LOG_LEVEL_WARNING
# define CAF_LOG_WARNING(output) CAF_LOG_IMPL(CAF_LOG_LEVEL_WARNING, output)
#endif
#endif // CAF_LOG_LEVEL #endif // CAF_LOG_LEVEL
#define CAF_LOG_DEBUG(output) CAF_LOG_IMPL(CAF_LOG_LEVEL_DEBUG, output) #ifndef CAF_LOG_INFO
#define CAF_LOG_INFO(output) CAF_LOG_IMPL(CAF_LOG_LEVEL_INFO, output) # define CAF_LOG_INFO(output) CAF_VOID_STMT
#define CAF_LOG_WARNING(output) CAF_LOG_IMPL(CAF_LOG_LEVEL_WARNING, output) #endif
#ifndef CAF_LOG_DEBUG
# define CAF_LOG_DEBUG(output) CAF_VOID_STMT
#endif
#ifndef CAF_LOG_WARNING
# define CAF_LOG_WARNING(output) CAF_VOID_STMT
#endif
#define CAF_LOG_ERROR(output) \ #define CAF_LOG_ERROR(output) \
do { \ do { \
CAF_PRINT_ERROR_IMPL(CAF_GET_CLASS_NAME, __func__, output); \ CAF_PRINT_ERROR_IMPL(CAF_GET_CLASS_NAME, __func__, output); \
......
...@@ -294,22 +294,22 @@ void logger::run() { ...@@ -294,22 +294,22 @@ void logger::run() {
} }
void logger::start() { void logger::start() {
# ifdef CAF_LOG_LEVEL #if CAF_LOG_LEVEL >= CAF_LOG_LEVEL_INFO
const char* log_level_table[] = {"ERROR", "WARN", "INFO", "DEBUG", "TRACE"}; const char* log_level_table[] = {"ERROR", "WARN", "INFO", "DEBUG", "TRACE"};
thread_ = std::thread{[this] { this->run(); }}; thread_ = std::thread{[this] { this->run(); }};
std::string msg = "ENTRY log level = "; std::string msg = "ENTRY log level = ";
msg += log_level_table[global_log_level]; msg += log_level_table[global_log_level];
log(4, "caf", "caf::logger", "run", __FILE__, __LINE__, msg); log(CAF_LOG_LEVEL_INFO, "caf", "caf::logger", "run", __FILE__, __LINE__, msg);
# endif #endif
} }
void logger::stop() { void logger::stop() {
# ifdef CAF_LOG_LEVEL #if CAF_LOG_LEVEL >= CAF_LOG_LEVEL_INFO
log(4, "caf", "caf::logger", "run", __FILE__, __LINE__, "EXIT"); log(CAF_LOG_LEVEL_INFO, "caf", "caf::logger", "run", __FILE__, __LINE__, "EXIT");
// an empty string means: shut down // an empty string means: shut down
queue_.synchronized_enqueue(queue_mtx_, queue_cv_, new event{""}); queue_.synchronized_enqueue(queue_mtx_, queue_cv_, new event{""});
thread_.join(); thread_.join();
# endif #endif
} }
} // namespace caf } // namespace caf
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment