From e43cd79fcb18b2372a44583d3efb1db961c3f2d7 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Mon, 22 Dec 2014 17:31:53 +0000 Subject: [PATCH] Fix stupid deadlock in the logger. --- src/libutil/logger.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/libutil/logger.c b/src/libutil/logger.c index 2cb51cbb8..905804ca4 100644 --- a/src/libutil/logger.c +++ b/src/libutil/logger.c @@ -113,19 +113,17 @@ direct_write_log_line (rspamd_logger_t *rspamd_log, } if (r == -1) { /* We cannot write message to file, so we need to detect error and make decision */ + if (errno == EINTR) { + /* Try again */ + direct_write_log_line (rspamd_log, data, count, is_iov); + return; + } + r = rspamd_snprintf (errmsg, sizeof (errmsg), "direct_write_log_line: cannot write log line: %s", strerror (errno)); - if (errno == EIO || errno == EINTR) { - /* Descriptor is somehow invalid, try to restart */ - rspamd_log_reopen (rspamd_log); - if (write (rspamd_log->fd, errmsg, r) != -1) { - /* Try again */ - direct_write_log_line (rspamd_log, data, count, is_iov); - } - } - else if (errno == EFAULT || errno == EINVAL || errno == EFBIG || + if (errno == EFAULT || errno == EINVAL || errno == EFBIG || errno == ENOSPC) { /* Rare case */ rspamd_log->throttling = TRUE; -- 2.39.5