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

Remove duplicity in logsys code

Browse Source 
git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2185 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Jan Friesse 2009-05-18 09:42:57 +00:00
parent 8c7a454e2e
commit caceb59f1e
2 changed files with 2 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
exec/Makefile.am
View File

@ -141,14 +141,3 @@ uninstall-local:
clean-local:
rm -f corosync *.o *.lcrso gmon.out *.da *.bb *.bbg *.so*
# Since we're requiring that _logsys_log_printf and _logsys_log_vprintf
# have nearly identical code, here we require that they stay in sync.
check_logsys_log_printf_functions:
$(AWK) '/^void _logsys_log_printf \(/, /^}/' $(srcdir)/logsys.c \
| sed '/^[ ]*va_/d;s/\.\.\.)$$/va_list ap)/' > $@-1
$(AWK) '/^void _logsys_log_vprintf \(/, /^}/' $(srcdir)/logsys.c \
| sed 's/log_vprintf/log_printf/' > $@-2
diff $@-1 $@-2 && rm -f $@-1 $@-2
check: check_logsys_log_printf_functions

46
exec/logsys.c
View File

@ -1316,54 +1316,12 @@ void _logsys_log_printf (
const char *format,
...)
{
char logsys_print_buffer[COMBINE_BUFFER_SIZE];
unsigned int len;
va_list ap;
if (subsysid <= -1) {
subsysid = LOGSYS_MAX_SUBSYS_COUNT;
}
if ((level > logsys_loggers[subsysid].syslog_priority) &&
(level > logsys_loggers[subsysid].logfile_priority) &&
(logsys_loggers[subsysid].debug == 0)) {
return;
}
va_start (ap, format);
len = vsprintf (logsys_print_buffer, format, ap);
_logsys_log_vprintf (subsysid, function_name, file_name, file_line,
level, tag, format, ap);
va_end (ap);
if (logsys_print_buffer[len - 1] == '\n') {
logsys_print_buffer[len - 1] = '\0';
len -= 1;
}
/*
* Create a log record
*/
_logsys_log_rec (subsysid,
function_name,
file_name,
file_line,
level,
tag |= LOGSYS_TAG_LOG,
logsys_print_buffer, len + 1,
LOGSYS_REC_END);
if ((logsys_loggers[LOGSYS_MAX_SUBSYS_COUNT].mode & LOGSYS_MODE_THREADED) == 0) {
/*
* Output (and block) if the log mode is not threaded otherwise
* expect the worker thread to output the log data once signaled
*/
log_printf_to_logs (logsys_loggers[subsysid].subsys,
file_name, function_name, file_line, level, tag,
logsys_print_buffer);
} else {
/*
* Signal worker thread to display logging output
*/
wthread_signal ();
}
}
int _logsys_config_subsys_get (const char *subsys)