diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ferr.c | 2 | ||||
| -rw-r--r-- | lib/log.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/ferr.c b/lib/ferr.c index 2fa5db6f34..d1b9d514b4 100644 --- a/lib/ferr.c +++ b/lib/ferr.c @@ -146,7 +146,7 @@ void log_ref_display(struct vty *vty, uint32_t code, bool json) char ubuf[256]; snprintf(pbuf, sizeof(pbuf), "\nError %"PRIu32" - %s", - code, ref->title); + ref->code, ref->title); memset(ubuf, '=', strlen(pbuf)); ubuf[sizeof(ubuf) - 1] = '\0'; @@ -868,11 +868,16 @@ int zlog_rotate(void) save_errno = errno; umask(oldumask); if (zl->fp == NULL) { + + pthread_mutex_unlock(&loglock); + flog_err_sys( LIB_ERR_SYSTEM_CALL, "Log rotate failed: cannot open file %s for append: %s", zl->filename, safe_strerror(save_errno)); ret = -1; + + pthread_mutex_lock(&loglock); } else { logfile_fd = fileno(zl->fp); zl->maxlvl[ZLOG_DEST_FILE] = level; |