Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PR for issue#70 #98

Merged
merged 10 commits into from
Mar 28, 2018
Merged

PR for issue#70 #98

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cb51529
Force flush for rcutils logging
Mar 16, 2018
1abfe0e
Update logging.c
sagniknitr Mar 16, 2018
104e833
Fix logging.c as per the review received.
sagniknitr Mar 17, 2018
dd0f808
Remove redundant else case
sagniknitr Mar 22, 2018
9fe41a2
Clean up the fprintf section
sagniknitr Mar 22, 2018
2b7759d
Update logging.c
sagniknitr Mar 22, 2018
013b23e
Double check fprintf functions for correct spacing
sagniknitr Mar 27, 2018
3d758bb
add space between two strings
dirk-thomas Mar 27, 2018
92f1873
remove unnecessary quotes
dirk-thomas Mar 27, 2018
4d0fa2d
add space between two strings
dirk-thomas Mar 27, 2018
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
31 changes: 31 additions & 0 deletions src/logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,30 @@ bool g_rcutils_logging_severities_map_valid = false;

int g_rcutils_logging_default_logger_level = 0;

bool g_force_stdout_line_buffered = false;
bool g_stdout_flush_failure_reported = false;


rcutils_ret_t rcutils_logging_initialize(void)
{
const char * line_buffered;
const char * ret_str = rcutils_get_env("RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED", &line_buffered);

if (NULL == ret_str) {
if (strcmp(line_buffered, "1")) {
g_force_stdout_line_buffered = true;
} else {
if (!strcmp(line_buffered, "0")) {
fprintf(stderr,
"Warning: unexpected value [%s] specified for RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED. "
"Default value 0 will be used. Valid values are 1 or 0.\n",
line_buffered);
}
}
} else {
fprintf(stderr, "Error getting env. variable "
"RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED: %s\n", ret_str);
}
return rcutils_logging_initialize_with_allocator(rcutils_get_default_allocator());
}

Expand Down Expand Up @@ -557,6 +579,15 @@ void rcutils_logging_console_output_handler(
}
fprintf(stream, "%s\n", output_buffer);

if (g_force_stdout_line_buffered && stream == stdout) {
int flush_result = fflush(stream);
if (flush_result != 0 && !g_stdout_flush_failure_reported) {
g_stdout_flush_failure_reported = true;
fprintf(stderr, "Error: failed to perform fflush on stdout, fflush return code is: %d\n",
flush_result);
}
}

cleanup:
if (message_buffer && message_buffer != static_message_buffer) {
g_rcutils_logging_allocator.deallocate(message_buffer, g_rcutils_logging_allocator.state);
Expand Down