proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-07-25 01:26:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix output filtering when debug is enabled

Browse Source 
git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2101 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Fabio M. Di Nitto 2009-04-21 04:02:19 +00:00
parent f5edd27d1d
commit 1ecaa01b80
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
exec/logsys.c
View File

@ -386,27 +386,25 @@ static void log_printf_to_logs (
/*
* Output to syslog
*/
if (((logsys_loggers[subsysid].mode & LOGSYS_MODE_OUTPUT_SYSLOG) &&
(level <= logsys_loggers[subsysid].syslog_priority)) ||
(logsys_loggers[subsysid].debug != 0)) {
if ((logsys_loggers[subsysid].mode & LOGSYS_MODE_OUTPUT_SYSLOG) &&
((level <= logsys_loggers[subsysid].syslog_priority) ||
(logsys_loggers[subsysid].debug != 0))) {
syslog (level | logsys_loggers[subsysid].syslog_facility, "%s", output_buffer);
}
/*
* Terminate string with \n \0
*/
if (logsys_loggers[subsysid].mode & (LOGSYS_MODE_OUTPUT_FILE|LOGSYS_MODE_OUTPUT_STDERR)) {
output_buffer[output_buffer_idx++] = '\n';
output_buffer[output_buffer_idx] = '\0';
}
output_buffer[output_buffer_idx++] = '\n';
output_buffer[output_buffer_idx] = '\0';
/*
* Output to configured file
*/
if (((logsys_loggers[subsysid].mode & LOGSYS_MODE_OUTPUT_FILE) &&
logsys_loggers[subsysid].logfile_fp &&
(level <= logsys_loggers[subsysid].logfile_priority)) ||
(logsys_loggers[subsysid].debug != 0)) {
(logsys_loggers[subsysid].logfile_fp != NULL)) &&
((level <= logsys_loggers[subsysid].logfile_priority) ||
(logsys_loggers[subsysid].debug != 0))) {
/*
* Output to a file
*/
@ -436,9 +434,9 @@ static void log_printf_to_logs (
/*
* Output to stderr
*/
if (((logsys_loggers[subsysid].mode & LOGSYS_MODE_OUTPUT_STDERR) &&
(level <= logsys_loggers[subsysid].logfile_priority)) ||
(logsys_loggers[subsysid].debug != 0)) {
if ((logsys_loggers[subsysid].mode & LOGSYS_MODE_OUTPUT_STDERR) &&
((level <= logsys_loggers[subsysid].logfile_priority) ||
(logsys_loggers[subsysid].debug != 0))) {
if (write (STDERR_FILENO, output_buffer, strlen (output_buffer)) < 0) {
char tmpbuffer[1024];
/*