picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journal: add/use flushed_flag_is_set() helper (#4041)

Browse source 
Minor cleanup suggested by Lennart.
This commit is contained in:
Vito Caputo 2016-08-26 08:51:13 -07:00 committed by Lennart Poettering
parent 23cabb68ac
commit 6431c7e216
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/journal/journald-server.c
View file

@ -267,6 +267,10 @@ static int open_journal(
return r;
}
static bool flushed_flag_is_set(void) {
return (access("/run/systemd/journal/flushed", F_OK) >= 0);
}
static int system_journal_open(Server *s, bool flush_requested) {
bool flushed = false;
const char *fn;
@ -274,8 +278,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
if (!s->system_journal &&
(s->storage == STORAGE_PERSISTENT || s->storage == STORAGE_AUTO) &&
(flush_requested
|| (flushed = (access("/run/systemd/journal/flushed", F_OK) >= 0)))) {
(flush_requested || (flushed = flushed_flag_is_set()))) {
/* If in auto mode: first try to create the machine
* path, but not the prefix.