dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-17 04:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

journalctl: never fail at flushing when the flushed flag is set

Browse Source 
Even if journald was not running, flushing the volatile journal used to work if
the journal was already flushed (ie the flushed flag
/run/systemd/journald/flushed was created).

However since commit 4f413af2a0, this behavior changed and now '--flush' fails
because it tries to contact journald without checking the presence of the
flushed flag anymore.

This patch restores the previous behavior since there's no reason to fail when
journalctl can figure out that the flush is not necessary.
This commit is contained in:
Franck Bui
2021-08-04 11:20:07 +02:00
committed by Lennart Poettering
parent e236711fd7
commit f6fca35e64
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/journal/journalctl.c
View File

@@ -2064,6 +2064,11 @@ static int simple_varlink_call(const char *option, const char *method) {
}
static int flush_to_var(void) {
if (access("/run/systemd/journal/flushed", F_OK) >= 0)
return 0; /* Already flushed, no need to contact journald */
if (errno != ENOENT)
return log_error_errno(errno, "Unable to check for existence of /run/systemd/journal/flushed: %m");
return simple_varlink_call("--flush", "io.systemd.Journal.FlushToVar");
}