morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-16 01:16:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

journal: Add two more log messages to journal_file_rotate_suggested()

Browse Source 
This ensures every reason for rotation has an associated log message.
This commit is contained in:
Daan De Meyer
2021-10-12 11:03:44 +01:00
parent c8e6e1f10d
commit 012181eaef
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsystemd/sd-journal/journal-file.c
View File

@@ -4168,8 +4168,12 @@ bool journal_file_rotate_suggested(JournalFile *f, usec_t max_file_usec, int log
if (JOURNAL_HEADER_CONTAINS(f->header, n_data) &&
JOURNAL_HEADER_CONTAINS(f->header, n_fields) &&
le64toh(f->header->n_data) > 0 &&
le64toh(f->header->n_fields) == 0)
le64toh(f->header->n_fields) == 0) {
log_full(log_level,
"Data objects of %s are not indexed by field objects, suggesting rotation.",
f->path);
return true;
}
if (max_file_usec > 0) {
usec_t t, h;
@@ -4177,8 +4181,12 @@ bool journal_file_rotate_suggested(JournalFile *f, usec_t max_file_usec, int log
h = le64toh(f->header->head_entry_realtime);
t = now(CLOCK_REALTIME);
if (h > 0 && t > h + max_file_usec)
if (h > 0 && t > h + max_file_usec) {
log_full(log_level,
"Oldest entry in %s is older than the configured file retention duration (%s), suggesting rotation.",
f->path, FORMAT_TIMESPAN(max_file_usec, USEC_PER_SEC));
return true;
}
}
return false;