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

journalctl: be more friendly when informing about seal verification

This commit is contained in:
Lennart Poettering 2012-08-21 23:03:20 +02:00
parent 84cc2abf34
commit c0ca7aeec9
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TODO
View File

@ -49,6 +49,12 @@ Bugfixes:
Features:
* cleanup ellipsation for log output in journalctl and systemctl status: have a sane way to disable ellipsation, and disable it by default when invoked in less/more
* enforce limits on fds openened by socket units
* proper service failure code for services which hit the restart limit
* explore multiple service instances per listening socket idea
* testing tool for socket activation: some binary that listens on a socket and passes it on using the usual socket activation protocol to some server.

2
src/journal/journal-verify.c
View File

@ -1118,7 +1118,7 @@ int journal_file_verify(
close_nointr_nofail(entry_array_fd);
if (first_validated)
*first_validated = last_tag_realtime ? le64toh(f->header->head_entry_realtime) : 0;
*first_validated = last_sealed_realtime > 0 ? le64toh(f->header->head_entry_realtime) : 0;
if (last_validated)
*last_validated = last_sealed_realtime;
if (last_contained)

17
src/journal/journalctl.c
View File

@ -681,11 +681,18 @@ static int verify(sd_journal *j) {
char a[FORMAT_TIMESTAMP_MAX], b[FORMAT_TIMESTAMP_MAX], c[FORMAT_TIMESPAN_MAX];
log_info("PASS: %s", f->path);
if (arg_verify_key && JOURNAL_HEADER_SEALED(f->header))
log_info("=> Validated from %s to %s, %s missing",
format_timestamp(a, sizeof(a), from),
format_timestamp(b, sizeof(b), to),
format_timespan(c, sizeof(c), total > to ? total - to : 0));
if (arg_verify_key && JOURNAL_HEADER_SEALED(f->header)) {
if (from > 0) {
log_info("=> Validated from %s to %s, final %s entries not sealed.",
format_timestamp(a, sizeof(a), from),
format_timestamp(b, sizeof(b), to),
format_timespan(c, sizeof(c), total > to ? total - to : 0));
} else if (total > 0)
log_info("=> No sealing yet, %s of entries not sealed.",
format_timespan(c, sizeof(c), total));
else
log_info("=> No sealing yet, no entries in file.");
}
}
}