From 6c045c0b4c49c88a1d3b9360c05efa5084796d2d Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 3 Dec 2013 08:07:32 -0500 Subject: journal: fail silently in sd_j_sendv() if journal is unavailable "syslog(3) and sd_journal_print() may largely be used interchangeably functionality-wise" according to sd_journal_print(3). This socket should be always available except in rare circumstatances, and we don't random applications to fail on logging, so let's do what syslog did. The alternative of forcing all callers to do error handling for this rare case doesn't really have any benefits, since if they can't log there isn't much they can do anyway. https://bugzilla.redhat.com/show_bug.cgi?id=1023041 --- src/journal/journal-send.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c index 931c1e7330..281e154d8e 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -300,6 +300,10 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) { if (k >= 0) return 0; + /* Fail silently if the journal is not available */ + if (errno == ENOENT) + return 0; + if (errno != EMSGSIZE && errno != ENOBUFS) return -errno; -- cgit v1.2.3-54-g00ecf