From 4941e4aca907f26bf74aa9efe1c70ccad1d10a82 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Thu, 3 Dec 2015 02:44:50 -0500 Subject: journal: silently skip failing large messages if journald is missing We treated -ENOENT errors with silent failure, for small messages. Do the same for large messages. --- src/journal/journal-send.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/journal') diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c index adb3af006d..44fa11a00e 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -337,7 +337,11 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) { return r; } - return send_one_fd_sa(fd, buffer_fd, mh.msg_name, mh.msg_namelen, 0); + r = send_one_fd_sa(fd, buffer_fd, mh.msg_name, mh.msg_namelen, 0); + if (r == -ENOENT) + /* Fail silently if the journal is not available */ + return 0; + return r; } static int fill_iovec_perror_and_send(const char *message, int skip, struct iovec iov[]) { -- cgit v1.2.3-54-g00ecf