Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions rcl/src/rcl/logging.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,13 @@ rcl_logging_configure(const rcl_arguments_t * global_args, const rcl_allocator_t
g_logging_allocator = *allocator;
int default_level = global_args->impl->log_level;
const char * config_file = global_args->impl->external_log_config_file;
g_rcl_logging_stdout_enabled = !global_args->impl->log_stdout_disabled;
g_rcl_logging_rosout_enabled = !global_args->impl->log_rosout_disabled;
g_rcl_logging_ext_lib_enabled = !global_args->impl->log_ext_lib_disabled;
bool global_disable = false;
#ifdef RCUTILS_NO_LOGGING
global_disable = true;
#endif
g_rcl_logging_stdout_enabled = !global_args->impl->log_stdout_disabled && !global_disable;
g_rcl_logging_rosout_enabled = !global_args->impl->log_rosout_disabled && !global_disable;
g_rcl_logging_ext_lib_enabled = !global_args->impl->log_ext_lib_disabled && !global_disable;
rcl_ret_t status = RCL_RET_OK;
g_rcl_logging_num_out_handlers = 0;

Expand Down