proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-31 13:33:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2882 from qlyoung/fix-zlog-deadlock

Browse Source 
lib: fix deadlock in log.c
This commit is contained in:
David Lamparter 2018-08-21 21:21:28 +02:00 committed by GitHub
commit f4c28c4486
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/log.c
View File

@ -868,11 +868,16 @@ int zlog_rotate(void)
save_errno = errno; save_errno = errno;
umask(oldumask); umask(oldumask);
if (zl->fp == NULL) { if (zl->fp == NULL) {
pthread_mutex_unlock(&loglock);
flog_err_sys( flog_err_sys(
LIB_ERR_SYSTEM_CALL, LIB_ERR_SYSTEM_CALL,
"Log rotate failed: cannot open file %s for append: %s", "Log rotate failed: cannot open file %s for append: %s",
zl->filename, safe_strerror(save_errno)); zl->filename, safe_strerror(save_errno));
ret = -1; ret = -1;
pthread_mutex_lock(&loglock);
} else { } else {
logfile_fd = fileno(zl->fp); logfile_fd = fileno(zl->fp);
zl->maxlvl[ZLOG_DEST_FILE] = level; zl->maxlvl[ZLOG_DEST_FILE] = level;