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

Improve logsys error handling in logsys_format_set

Browse Source 
and logsys_config_file_set_unlocked.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2096 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Fabio M. Di Nitto 2009-04-20 10:43:37 +00:00
parent 45bc832371
commit 0f942b2ed9
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
exec/logsys.c
View File

@ -805,7 +805,10 @@ int _logsys_system_setup(
logsys_loggers[i].debug = debug;
if ((logfile) && strlen(logfile) > 0) {
logsys_config_file_set_unlocked (i, &errstr, logfile);
if (logsys_config_file_set_unlocked (i, &errstr, logfile) < 0) {
pthread_mutex_unlock (&logsys_config_mutex);
return (-1);
}
}
logsys_loggers[i].logfile_priority = logfile_priority;
@ -1226,9 +1229,11 @@ int logsys_config_file_set (
}
} else {
for (i = 0; i <= LOGSYS_MAX_SUBSYS_COUNT; i++) {
logsys_config_file_set_unlocked(i, error_string, file);
res = logsys_config_file_set_unlocked(i, error_string, file);
if (res < 0) {
break;
}
}
res = 0;
}
pthread_mutex_unlock (&logsys_config_mutex);
@ -1246,13 +1251,9 @@ int logsys_format_set (const char *format)
format_buffer = NULL;
}
if (format) {
format_buffer = strdup(format);
if (format_buffer == NULL) {
ret = -1;
}
} else {
format_buffer = strdup("[%6s] %b");
format_buffer = strdup(format ? format : "[%6s] %b");
if (format_buffer == NULL) {
ret = -1;
}
pthread_mutex_unlock (&logsys_config_mutex);