From 7c8bbccd071a9a12efdd8a7770b53d7786eb3a9c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 12 Jan 2012 05:09:24 +0100 Subject: [PATCH] journal: if the syslog forwarder socket is full, then don't block --- src/journal/journald.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/journal/journald.c b/src/journal/journald.c index 56cd31317..f924c9353 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -752,6 +752,11 @@ static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned if (sendmsg(s->syslog_fd, &msghdr, MSG_NOSIGNAL) >= 0) return; + /* The socket is full? I guess the syslog implementation is + * too slow, and we shouldn't wait for that... */ + if (errno == EAGAIN) + return; + if (ucred && errno == ESRCH) { struct ucred u; @@ -765,6 +770,9 @@ static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned if (sendmsg(s->syslog_fd, &msghdr, MSG_NOSIGNAL) >= 0) return; + + if (errno == EAGAIN) + return; } log_debug("Failed to forward syslog message: %m"); -- 2.30.2