Unverified Commit eabbc579 authored by Dominik Charousset's avatar Dominik Charousset Committed by GitHub

Merge pull request #744

Fix the "quiet" log level, close #743.
parents 65e1ef85 ac424216
...@@ -380,7 +380,6 @@ macro(to_int_value name) ...@@ -380,7 +380,6 @@ macro(to_int_value name)
endif() endif()
endmacro() endmacro()
to_int_value(CAF_LOG_LEVEL)
to_int_value(CAF_NO_EXCEPTIONS) to_int_value(CAF_NO_EXCEPTIONS)
to_int_value(CAF_NO_MEM_MANAGEMENT) to_int_value(CAF_NO_MEM_MANAGEMENT)
to_int_value(CAF_ENABLE_RUNTIME_CHECKS) to_int_value(CAF_ENABLE_RUNTIME_CHECKS)
......
...@@ -32,7 +32,7 @@ namespace caf { ...@@ -32,7 +32,7 @@ namespace caf {
template <class T, class R = infer_handle_from_class_t<T>, class... Ts> template <class T, class R = infer_handle_from_class_t<T>, class... Ts>
R make_actor(actor_id aid, node_id nid, actor_system* sys, Ts&&... xs) { R make_actor(actor_id aid, node_id nid, actor_system* sys, Ts&&... xs) {
#if defined(CAF_LOG_LEVEL) && CAF_LOG_LEVEL >= CAF_LOG_LEVEL_DEBUG #if CAF_LOG_LEVEL >= CAF_LOG_LEVEL_DEBUG
actor_storage<T>* ptr = nullptr; actor_storage<T>* ptr = nullptr;
if (logger::current_logger()->accepts(CAF_LOG_LEVEL_DEBUG, if (logger::current_logger()->accepts(CAF_LOG_LEVEL_DEBUG,
CAF_LOG_FLOW_COMPONENT)) { CAF_LOG_FLOW_COMPONENT)) {
......
...@@ -86,7 +86,7 @@ void actor_registry::erase(actor_id key) { ...@@ -86,7 +86,7 @@ void actor_registry::erase(actor_id key) {
} }
void actor_registry::inc_running() { void actor_registry::inc_running() {
# if defined(CAF_LOG_LEVEL) && CAF_LOG_LEVEL >= CAF_LOG_LEVEL_DEBUG # if CAF_LOG_LEVEL >= CAF_LOG_LEVEL_DEBUG
auto value = ++running_; auto value = ++running_;
CAF_LOG_DEBUG(CAF_ARG(value)); CAF_LOG_DEBUG(CAF_ARG(value));
# else # else
......
...@@ -233,11 +233,7 @@ logger::~logger() { ...@@ -233,11 +233,7 @@ logger::~logger() {
logger::logger(actor_system& sys) logger::logger(actor_system& sys)
: system_(sys), : system_(sys),
#ifdef CAF_LOG_LEVEL
level_(CAF_LOG_LEVEL), level_(CAF_LOG_LEVEL),
#else
level_(0),
#endif
flags_(0), flags_(0),
queue_(policy{}) { queue_(policy{}) {
// nop // nop
...@@ -245,7 +241,7 @@ logger::logger(actor_system& sys) ...@@ -245,7 +241,7 @@ logger::logger(actor_system& sys)
void logger::init(actor_system_config& cfg) { void logger::init(actor_system_config& cfg) {
CAF_IGNORE_UNUSED(cfg); CAF_IGNORE_UNUSED(cfg);
#if defined(CAF_LOG_LEVEL) #if CAF_LOG_LEVEL >= 0
namespace lg = defaults::logger; namespace lg = defaults::logger;
component_filter = get_or(cfg, "logger.component-filter", component_filter = get_or(cfg, "logger.component-filter",
lg::component_filter); lg::component_filter);
...@@ -434,7 +430,7 @@ const char* logger::skip_path(const char* path) { ...@@ -434,7 +430,7 @@ const char* logger::skip_path(const char* path) {
} }
void logger::run() { void logger::run() {
#if defined(CAF_LOG_LEVEL) #if CAF_LOG_LEVEL >= 0
log_first_line(); log_first_line();
// receive log entries from other threads and actors // receive log entries from other threads and actors
bool stop = false; bool stop = false;
...@@ -523,7 +519,7 @@ void logger::log_last_line() { ...@@ -523,7 +519,7 @@ void logger::log_last_line() {
} }
void logger::start() { void logger::start() {
#if defined(CAF_LOG_LEVEL) #if CAF_LOG_LEVEL >= 0
parent_thread_ = std::this_thread::get_id(); parent_thread_ = std::this_thread::get_id();
if (level_ == CAF_LOG_LEVEL_QUIET) if (level_ == CAF_LOG_LEVEL_QUIET)
return; return;
...@@ -573,7 +569,7 @@ void logger::start() { ...@@ -573,7 +569,7 @@ void logger::start() {
} }
void logger::stop() { void logger::stop() {
#if defined(CAF_LOG_LEVEL) #if CAF_LOG_LEVEL >= 0
if (has(inline_output_flag)) { if (has(inline_output_flag)) {
log_last_line(); log_last_line();
return; return;
......
...@@ -88,7 +88,7 @@ CAF_TEST(parse_default_format_strings) { ...@@ -88,7 +88,7 @@ CAF_TEST(parse_default_format_strings) {
add(logger::message_field); add(logger::message_field);
add(logger::newline_field); add(logger::newline_field);
CAF_CHECK_EQUAL(logger::parse_format(file_format), lf); CAF_CHECK_EQUAL(logger::parse_format(file_format), lf);
#ifdef CAF_LOG_LEVEL #if CAF_LOG_LEVEL >= 0
// Not parsed when compiling without logging enabled. // Not parsed when compiling without logging enabled.
CAF_CHECK_EQUAL(sys.logger().file_format(), lf); CAF_CHECK_EQUAL(sys.logger().file_format(), lf);
#endif #endif
......
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