X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=e9810c9a3d1cf7b9bb18af0a592fb5563d2ae83c;hb=4a842cadb8d6b30fa9fdc8ff183633c14e02cf96;hp=6929b7601867302d466abf960f3324eb4acb5016;hpb=59cea26a349cfa8db906b520dac72563dd773ff2;p=elogind.git diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 6929b7601..e9810c9a3 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -39,6 +39,8 @@ #include "build.h" #include "pager.h" #include "logs-show.h" +#include "strv.h" +#include "journal-internal.h" static OutputMode arg_output = OUTPUT_SHORT; static bool arg_follow = false; @@ -47,9 +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) { @@ -67,6 +71,8 @@ static int help(void) { " -q --quiet Don't show privilege warning\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); @@ -79,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[] = { @@ -95,6 +102,8 @@ static int parse_argv(int argc, char *argv[]) { { "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 } }; @@ -103,7 +112,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "hfo:an:qlb", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "hfo:an:qlbD:", options, NULL)) >= 0) { switch (c) { @@ -166,6 +175,14 @@ static int parse_argv(int argc, char *argv[]) { arg_this_boot = true; break; + case 'D': + arg_directory = optarg; + break; + + case ARG_HEADER: + arg_print_header = true; + break; + case '?': return -EINVAL; @@ -209,68 +226,28 @@ static int generate_new_id128(void) { return 0; } -int main(int argc, char *argv[]) { - int r, i, fd; - sd_journal *j = NULL; - unsigned line = 0; - bool need_seek = false; - struct stat st; - - log_parse_environment(); - log_open(); - - r = parse_argv(argc, argv); - if (r <= 0) - goto finish; - - if (arg_new_id128) { - r = generate_new_id128(); - goto finish; - } - -#ifdef HAVE_ACL - if (!arg_quiet && geteuid() != 0 && in_group("adm") <= 0) - 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 (r < 0) { - log_error("Failed to open journal: %s", strerror(-r)); - goto finish; - } - - if (arg_this_boot) { - char match[9+32+1] = "_BOOT_ID="; - sd_id128_t boot_id; - - r = sd_id128_get_boot(&boot_id); - if (r < 0) { - log_error("Failed to get boot id: %s", strerror(-r)); - goto finish; - } +static int add_matches(sd_journal *j, char **args) { + char **i; + int r; - sd_id128_to_string(boot_id, match + 9); + assert(j); - r = sd_journal_add_match(j, match, strlen(match)); - if (r < 0) { - log_error("Failed to add match: %s", strerror(-r)); - goto finish; - } - } + STRV_FOREACH(i, args) { - for (i = optind; i < argc; i++) { - if (path_is_absolute(argv[i])) { - char *p = NULL; + 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(argv[i]); - path = p ? p : argv[i]; + p = canonicalize_file_name(*i); + path = p ? p : *i; if (stat(path, &st) < 0) { free(p); log_error("Couldn't stat file: %m"); - r = -errno; - goto finish; + return -errno; } if (S_ISREG(st.st_mode) && (0111 & st.st_mode)) { @@ -280,33 +257,104 @@ int main(int argc, char *argv[]) { if (!t) { free(p); log_error("Out of memory"); - goto finish; + return -ENOMEM; } - r = sd_journal_add_match(j, t, strlen(t)); + 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", argv[i]); - goto finish; + 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, argv[i], strlen(argv[i])); + r = sd_journal_add_match(j, *i, 0); if (r < 0) { - log_error("Failed to add match: %s", strerror(-r)); - goto finish; + log_error("Failed to add match '%s': %s", *i, strerror(-r)); + return r; } } - fd = sd_journal_get_fd(j); - if (fd < 0) { - log_error("Failed to get wakeup fd: %s", strerror(-fd)); + 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; + sd_journal *j = NULL; + unsigned line = 0; + bool need_seek = false; + sd_id128_t previous_boot_id; + bool previous_boot_id_valid = false; + bool have_pager; + + log_parse_environment(); + log_open(); + + r = parse_argv(argc, argv); + if (r <= 0) + goto finish; + + if (arg_new_id128) { + r = generate_new_id128(); goto finish; } +#ifdef HAVE_ACL + if (!arg_quiet && geteuid() != 0 && in_group("adm") <= 0) + log_warning("Showing user generated messages only. Users in the group 'adm' can see all messages. Pass -q to turn this message off."); +#endif + + 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; + } + + 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]; @@ -350,7 +398,8 @@ int main(int argc, char *argv[]) { goto finish; } - if (!arg_no_pager && !arg_follow) { + have_pager = !arg_no_pager && !arg_follow; + if (have_pager) { columns(); pager_open(); } @@ -362,6 +411,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) { @@ -373,9 +426,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; @@ -385,15 +448,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; } }