From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 24 May 2019 13:32:08 +0000 (+0900)
Subject: journalctl: make 'journalctl --flush' or friends not fail with varlink timeout
X-Git-Tag: v243-rc1~316^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F12661%2Fhead;p=thirdparty%2Fsystemd.git

journalctl: make 'journalctl --flush' or friends not fail with varlink timeout

Closes #12570.
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index b7c378eaa94..3d053c59f00 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1952,6 +1952,7 @@ static int simple_varlink_call(const char *option, const char *method) {
                 return log_error_errno(r, "Failed to connect to /run/systemd/journal/io.systemd.journal: %m");
 
         (void) varlink_set_description(link, "journal");
+        (void) varlink_set_relative_timeout(link, USEC_INFINITY);
 
         r = varlink_call(link, method, NULL, NULL, &error, NULL);
         if (r < 0)