From 39fd5b08a73f144a20202a665bd25cad51d8a90b Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Mon, 1 Feb 2016 09:23:58 +0100 Subject: sd-journal: introduce has_runtime_files and has_persistent_files Also introduce sd_journal_has_runtime_files() and sd_journal_has_persistent_files() to the public API. These functions can be used to easily find out if the open journal files are runtime and/or persistent. --- Makefile-man.am | 7 +++ man/sd-journal.xml | 8 ++- man/sd_journal_has_runtime_files.xml | 95 ++++++++++++++++++++++++++++++++++++ src/journal/journal-internal.h | 2 + src/journal/sd-journal.c | 18 +++++++ src/systemd/sd-journal.h | 3 ++ 6 files changed, 131 insertions(+), 2 deletions(-) create mode 100644 man/sd_journal_has_runtime_files.xml diff --git a/Makefile-man.am b/Makefile-man.am index 0055746a70..12900daa96 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -79,6 +79,7 @@ MANPAGES += \ man/sd_journal_get_fd.3 \ man/sd_journal_get_realtime_usec.3 \ man/sd_journal_get_usage.3 \ + man/sd_journal_has_runtime_files.3 \ man/sd_journal_next.3 \ man/sd_journal_open.3 \ man/sd_journal_print.3 \ @@ -384,6 +385,7 @@ MANPAGES_ALIAS += \ man/sd_journal_get_events.3 \ man/sd_journal_get_monotonic_usec.3 \ man/sd_journal_get_timeout.3 \ + man/sd_journal_has_persistent_files.3 \ man/sd_journal_next_skip.3 \ man/sd_journal_open_container.3 \ man/sd_journal_open_directory.3 \ @@ -711,6 +713,7 @@ man/sd_journal_get_data_threshold.3: man/sd_journal_get_data.3 man/sd_journal_get_events.3: man/sd_journal_get_fd.3 man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3 man/sd_journal_get_timeout.3: man/sd_journal_get_fd.3 +man/sd_journal_has_persistent_files.3: man/sd_journal_has_runtime_files.3 man/sd_journal_next_skip.3: man/sd_journal_next.3 man/sd_journal_open_container.3: man/sd_journal_open.3 man/sd_journal_open_directory.3: man/sd_journal_open.3 @@ -1458,6 +1461,9 @@ man/sd_journal_get_monotonic_usec.html: man/sd_journal_get_realtime_usec.html man/sd_journal_get_timeout.html: man/sd_journal_get_fd.html $(html-alias) +man/sd_journal_has_persistent_files.html: man/sd_journal_has_runtime_files.html + $(html-alias) + man/sd_journal_next_skip.html: man/sd_journal_next.html $(html-alias) @@ -2535,6 +2541,7 @@ EXTRA_DIST += \ man/sd_journal_get_fd.xml \ man/sd_journal_get_realtime_usec.xml \ man/sd_journal_get_usage.xml \ + man/sd_journal_has_runtime_files.xml \ man/sd_journal_next.xml \ man/sd_journal_open.xml \ man/sd_journal_print.xml \ diff --git a/man/sd-journal.xml b/man/sd-journal.xml index 9b1a52207f..a1185d372b 100644 --- a/man/sd-journal.xml +++ b/man/sd-journal.xml @@ -81,9 +81,11 @@ sd_journal_get_cutoff_realtime_usec3, sd_journal_get_cutoff_monotonic_usec3, sd_journal_get_usage3, - sd_journal_get_catalog3 + sd_journal_get_catalog3, + sd_journal_get_fd3, + sd_journal_has_runtime_files3 and - sd_journal_get_fd3 + sd_journal_has_persistent_files3 for more information about the functions implemented. Command line access for submitting entries to the journal is @@ -116,6 +118,8 @@ sd_journal_get_fd3, sd_journal_query_unique3, sd_journal_get_catalog3, + sd_journal_has_runtime_files3, + sd_journal_has_persistent_files3, journalctl1, sd-id1283, pkg-config1 diff --git a/man/sd_journal_has_runtime_files.xml b/man/sd_journal_has_runtime_files.xml new file mode 100644 index 0000000000..237e649206 --- /dev/null +++ b/man/sd_journal_has_runtime_files.xml @@ -0,0 +1,95 @@ + + + + + + + + + sd_journal_has_runtime_files + systemd + + + + Developer + Jan + Synáček + jan.synacek@gmail.com + + + + + + sd_journal_has_runtime_files + 3 + + + + sd_journal_has_runtime_files + sd_journal_has_persistent_files + Query availability of runtime or persistent journal files. + + + + + #include <systemd/sd-journal.h> + + + int sd_journal_has_runtime_files + sd_journal *j + + + + int sd_journal_has_persistent_files + sd_journal *j + + + + + + + Description + + sd_journal_has_runtime_files() returns a positive value + if runtime journal files (present in /run/systemd/journal/) have been found. + Otherwise returns 0. + + sd_journal_has_persistent_files() returns a positive value + if persistent journal files (present in /var/log/journal/) have been found. + Otherwise returns 0. + + + + Return value + Both sd_journal_has_runtime_files() + and sd_journal_has_persistent_files() return -EINVAL + if their argument is NULL. + + + + + See Also + + sd-journal3 + + + + diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h index 9ff4fea7fb..fa5ca11636 100644 --- a/src/journal/journal-internal.h +++ b/src/journal/journal-internal.h @@ -115,6 +115,8 @@ struct sd_journal { removed, and there were no more files, so sd_j_enumerate_unique will return a value equal to 0. */ + bool has_runtime_files:1; + bool has_persistent_files:1; size_t data_threshold; diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index cd5160154a..74a5e262f8 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -1292,6 +1292,12 @@ static int add_file(sd_journal *j, const char *prefix, const char *filename) { return 0; path = strjoina(prefix, "/", filename); + + if (!j->has_runtime_files && path_startswith(path, "/run/log/journal")) + j->has_runtime_files = true; + else if (!j->has_persistent_files && path_startswith(path, "/var/log/journal")) + j->has_persistent_files = true; + return add_any_file(j, path); } @@ -2630,3 +2636,15 @@ _public_ int sd_journal_get_data_threshold(sd_journal *j, size_t *sz) { *sz = j->data_threshold; return 0; } + +_public_ int sd_journal_has_runtime_files(sd_journal *j) { + assert_return(j, -EINVAL); + + return j->has_runtime_files; +} + +_public_ int sd_journal_has_persistent_files(sd_journal *j) { + assert_return(j, -EINVAL); + + return j->has_persistent_files; +} diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h index 33e36149e9..7f16c69ce5 100644 --- a/src/systemd/sd-journal.h +++ b/src/systemd/sd-journal.h @@ -139,6 +139,9 @@ int sd_journal_reliable_fd(sd_journal *j); int sd_journal_get_catalog(sd_journal *j, char **text); int sd_journal_get_catalog_for_message_id(sd_id128_t id, char **text); +int sd_journal_has_runtime_files(sd_journal *j); +int sd_journal_has_persistent_files(sd_journal *j); + /* the inverse condition avoids ambiguity of danling 'else' after the macro */ #define SD_JOURNAL_FOREACH(j) \ if (sd_journal_seek_head(j) < 0) { } \ -- cgit v1.2.3-54-g00ecf From 0f1a9a830c87d8accdc3a44d0a93ad343e52a7bd Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Mon, 1 Feb 2016 09:25:22 +0100 Subject: journalctl: show friendly info when using -b on runtime journal only Make it clear that specifing boot when there is actually only one has no effect. This cosmetic patch improves user experience a bit. --- src/journal/journalctl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index db11421e7a..69a2013df8 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -2091,6 +2091,13 @@ int main(int argc, char *argv[]) { assert_not_reached("Unknown action"); } + if (arg_boot_offset != 0 && + sd_journal_has_runtime_files(j) > 0 && + sd_journal_has_persistent_files(j) == 0) { + log_info("Specifying boot ID has no effect, no persistent journal was found"); + r = 0; + goto finish; + } /* add_boot() must be called first! * It may need to seek the journal to find parent boot IDs. */ r = add_boot(j); -- cgit v1.2.3-54-g00ecf From c34e939909710bf124e7741c3648592a30418ffd Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Mon, 1 Feb 2016 09:29:02 +0100 Subject: journalctl: improve error messages when the specified boot is not found --- src/journal/journalctl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 69a2013df8..1686f38c4e 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1136,10 +1136,11 @@ static int add_boot(sd_journal *j) { const char *reason = (r == 0) ? "No such boot ID in journal" : strerror(-r); if (sd_id128_is_null(arg_boot_id)) - log_error("Failed to look up boot %+i: %s", arg_boot_offset, reason); + log_error("Data from the specified boot (%+i) is not available: %s", + arg_boot_offset, reason); else - log_error("Failed to look up boot ID "SD_ID128_FORMAT_STR"%+i: %s", - SD_ID128_FORMAT_VAL(arg_boot_id), arg_boot_offset, reason); + log_error("Data from the specified boot ("SD_ID128_FORMAT_STR") is not available: %s", + SD_ID128_FORMAT_VAL(arg_boot_id), reason); return r == 0 ? -ENODATA : r; } -- cgit v1.2.3-54-g00ecf