X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=e633dd34d77841437ee1e73a9e463cee2b076d2e;hp=daf428106518a55632d0297e282aafd419250b19;hb=fafb6eccc2c9e3f8d6ce0aad9cb428f8cc402b24;hpb=509407003de0c77259e5e46b567d2a464acbb6f4 diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index daf428106..e633dd34d 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -35,11 +35,12 @@ #include "log.h" #include "util.h" +#include "path-util.h" #include "build.h" #include "pager.h" #include "logs-show.h" - -#define SD_JOURNALCTL_EXE "_EXE=" +#include "strv.h" +#include "journal-internal.h" static OutputMode arg_output = OUTPUT_SHORT; static bool arg_follow = false; @@ -48,8 +49,11 @@ static bool arg_no_pager = false; static int arg_lines = -1; static bool arg_no_tail = false; static bool arg_new_id128 = false; +static bool arg_print_header = false; static bool arg_quiet = false; static bool arg_local = false; +static bool arg_this_boot = false; +static const char *arg_directory = NULL; static int help(void) { @@ -65,8 +69,11 @@ static int help(void) { " -o --output=STRING Change journal output mode (short, short-monotonic,\n" " verbose, export, json, cat)\n" " -q --quiet Don't show privilege warning\n" - " --new-id128 Generate a new 128 Bit id\n" - " -l --local Only local entries\n", + " -l --local Only local entries\n" + " -b --this-boot Show data only from current boot\n" + " -D --directory=PATH Show journal files from directory\n" + " --header Show journal header information\n" + " --new-id128 Generate a new 128 Bit id\n", program_invocation_short_name); return 0; @@ -78,7 +85,8 @@ static int parse_argv(int argc, char *argv[]) { ARG_VERSION = 0x100, ARG_NO_PAGER, ARG_NO_TAIL, - ARG_NEW_ID128 + ARG_NEW_ID128, + ARG_HEADER }; static const struct option options[] = { @@ -93,6 +101,9 @@ static int parse_argv(int argc, char *argv[]) { { "new-id128", no_argument, NULL, ARG_NEW_ID128 }, { "quiet", no_argument, NULL, 'q' }, { "local", no_argument, NULL, 'l' }, + { "this-boot", no_argument, NULL, 'b' }, + { "directory", required_argument, NULL, 'D' }, + { "header", no_argument, NULL, ARG_HEADER }, { NULL, 0, NULL, 0 } }; @@ -101,7 +112,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "hfo:an:ql", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "hfo:an:qlbD:", options, NULL)) >= 0) { switch (c) { @@ -160,6 +171,18 @@ static int parse_argv(int argc, char *argv[]) { arg_local = true; break; + case 'b': + arg_this_boot = true; + break; + + case 'D': + arg_directory = optarg; + break; + + case ARG_HEADER: + arg_print_header = true; + break; + case '?': return -EINVAL; @@ -203,13 +226,93 @@ static int generate_new_id128(void) { return 0; } +static int add_matches(sd_journal *j, char **args) { + char **i; + int r; + + assert(j); + + STRV_FOREACH(i, args) { + + if (streq(*i, "+")) + r = sd_journal_add_disjunction(j); + else if (path_is_absolute(*i)) { + char *p; + const char *path; + struct stat st; + + p = canonicalize_file_name(*i); + path = p ? p : *i; + + if (stat(path, &st) < 0) { + free(p); + log_error("Couldn't stat file: %m"); + return -errno; + } + + if (S_ISREG(st.st_mode) && (0111 & st.st_mode)) { + char *t; + + t = strappend("_EXE=", path); + if (!t) { + free(p); + log_error("Out of memory"); + return -ENOMEM; + } + + r = sd_journal_add_match(j, t, 0); + free(t); + } else { + free(p); + log_error("File is not a regular file or is not executable: %s", *i); + return -EINVAL; + } + + free(p); + } else + r = sd_journal_add_match(j, *i, 0); + + if (r < 0) { + log_error("Failed to add match '%s': %s", *i, strerror(-r)); + return r; + } + } + + return 0; +} + +static int add_this_boot(sd_journal *j) { + char match[9+32+1] = "_BOOT_ID="; + sd_id128_t boot_id; + int r; + + if (!arg_this_boot) + return 0; + + r = sd_id128_get_boot(&boot_id); + if (r < 0) { + log_error("Failed to get boot id: %s", strerror(-r)); + return r; + } + + sd_id128_to_string(boot_id, match + 9); + r = sd_journal_add_match(j, match, strlen(match)); + if (r < 0) { + log_error("Failed to add match: %s", strerror(-r)); + return r; + } + + return 0; +} + int main(int argc, char *argv[]) { - int r, i, fd; + int r; sd_journal *j = NULL; unsigned line = 0; bool need_seek = false; - struct stat st; - char* journal_exe_buff; + sd_id128_t previous_boot_id; + bool previous_boot_id_valid = false; + bool have_pager; log_parse_environment(); log_open(); @@ -228,42 +331,48 @@ int main(int argc, char *argv[]) { log_warning("Showing user generated messages only. Users in the group 'adm' can see all messages. Pass -q to turn this message off."); #endif - r = sd_journal_open(&j, arg_local ? SD_JOURNAL_LOCAL_ONLY : 0); + if (arg_directory) + r = sd_journal_open_directory(&j, arg_directory, 0); + else + r = sd_journal_open(&j, arg_local ? SD_JOURNAL_LOCAL_ONLY : 0); + if (r < 0) { log_error("Failed to open journal: %s", strerror(-r)); goto finish; } - for (i = optind; i < argc; i++) { - if (strchr(argv[i], '=')) { - r = sd_journal_add_match(j, argv[i], strlen(argv[i])); - } else { - if (stat(argv[i], &st) < 0) { - log_error("Failed to add match: %s", strerror(-r)); - goto finish; /* maybe try sd_journal_add_match() when stat() fails, - * even thought we know there is no '=' ? */ - } else if (S_ISREG(st.st_mode) && - S_IXUSR & st.st_mode) { - journal_exe_buff = malloc(strlen(SD_JOURNALCTL_EXE) + strlen(argv[i]) + 1); - journal_exe_buff = strcpy(journal_exe_buff, SD_JOURNALCTL_EXE); - strncat(journal_exe_buff, argv[i], strlen(argv[i])); - r = sd_journal_add_match(j, journal_exe_buff, strlen(journal_exe_buff)); - free(journal_exe_buff); - } else { - log_error("File is not a regular file or is not executable: %s", argv[i]); - goto finish; - } - } + if (arg_print_header) { + journal_print_header(j); + r = 0; + goto finish; + } + + r = add_this_boot(j); + if (r < 0) + goto finish; + + r = add_matches(j, argv + optind); + if (r < 0) + goto finish; + + if (!arg_quiet) { + usec_t start, end; + char start_buf[FORMAT_TIMESTAMP_MAX], end_buf[FORMAT_TIMESTAMP_MAX]; + + r = sd_journal_get_cutoff_realtime_usec(j, &start, &end); if (r < 0) { - log_error("Failed to add match: %s", strerror(-r)); + log_error("Failed to get cutoff: %s", strerror(-r)); goto finish; } - } - fd = sd_journal_get_fd(j); - if (fd < 0) { - log_error("Failed to get wakeup fd: %s", strerror(-fd)); - goto finish; + if (r > 0) { + if (arg_follow) + printf("Logs begin at %s.\n", format_timestamp(start_buf, sizeof(start_buf), start)); + else + printf("Logs begin at %s, end at %s.\n", + format_timestamp(start_buf, sizeof(start_buf), start), + format_timestamp(end_buf, sizeof(end_buf), end)); + } } if (arg_lines >= 0) { @@ -289,10 +398,7 @@ int main(int argc, char *argv[]) { goto finish; } - if (!arg_no_pager && !arg_follow) { - columns(); - pager_open(); - } + have_pager = !arg_no_pager && !arg_follow && pager_open(); if (arg_output == OUTPUT_JSON) { fputc('[', stdout); @@ -301,6 +407,10 @@ int main(int argc, char *argv[]) { for (;;) { for (;;) { + sd_id128_t boot_id; + int flags = (arg_show_all*OUTPUT_SHOW_ALL | + have_pager*OUTPUT_FULL_WIDTH); + if (need_seek) { r = sd_journal_next(j); if (r < 0) { @@ -312,9 +422,19 @@ int main(int argc, char *argv[]) { if (r == 0) break; + r = sd_journal_get_monotonic_usec(j, NULL, &boot_id); + if (r >= 0) { + if (previous_boot_id_valid && + !sd_id128_equal(boot_id, previous_boot_id)) + printf(ANSI_HIGHLIGHT_ON "----- Reboot -----" ANSI_HIGHLIGHT_OFF "\n"); + + previous_boot_id = boot_id; + previous_boot_id_valid = true; + } + line ++; - r = output_journal(j, arg_output, line, 0, arg_show_all); + r = output_journal(j, arg_output, line, 0, flags); if (r < 0) goto finish; @@ -324,15 +444,9 @@ int main(int argc, char *argv[]) { if (!arg_follow) break; - r = fd_wait_for_event(fd, POLLIN, (usec_t) -1); - if (r < 0) { - log_error("Couldn't wait for event: %s", strerror(-r)); - goto finish; - } - - r = sd_journal_process(j); + r = sd_journal_wait(j, (uint64_t) -1); if (r < 0) { - log_error("Failed to process: %s", strerror(-r)); + log_error("Couldn't wait for log event: %s", strerror(-r)); goto finish; } }