X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=fc1fed277c4df6a0921b2be11f5d9125ad43097e;hb=2100675e9fe0707fae8cee13fbe9316e94ef98f9;hp=4645f9ebb015ab539c7cf174f12a08df622e9512;hpb=0ac38b707212e9aa40e25d65ffbae648cc9116f5;p=elogind.git diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 4645f9ebb..fc1fed277 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -22,104 +22,242 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include -#include "journal-file.h" +#include "sd-journal.h" +#include "log.h" +#include "util.h" +#include "build.h" +#include "pager.h" +#include "logs-show.h" -static int system_journal_open(JournalFile **f) { - int r; - char *fn; - sd_id128_t machine; - char ids[33]; +static output_mode arg_output = OUTPUT_SHORT; - assert(f); +static bool arg_follow = false; +static bool arg_show_all = false; +static bool arg_no_pager = false; +static int arg_lines = -1; - r = sd_id128_get_machine(&machine); - if (r < 0) - return r; +static int help(void) { - fn = join("/var/log/journal/", sd_id128_to_string(machine, ids), "/system.journal", NULL); - if (!fn) - return -ENOMEM; + printf("%s [OPTIONS...] {COMMAND} ...\n\n" + "Send control commands to or query the login manager.\n\n" + " -h --help Show this help\n" + " --version Show package version\n" + " --no-pager Do not pipe output into a pager\n" + " -a --all Show all properties, including long and unprintable\n" + " -f --follow Follow journal\n" + " -n --lines=INTEGER Lines to show\n" + " -o --output=STRING Change output mode (short, verbose, export, json)\n", + program_invocation_short_name); - r = journal_file_open(fn, O_RDONLY, 0640, NULL, f); - free(fn); + return 0; +} - if (r >= 0) - return r; +static int parse_argv(int argc, char *argv[]) { - if (r < 0 && r != -ENOENT) { - log_error("Failed to open system journal: %s", strerror(-r)); - return r; - } + enum { + ARG_VERSION = 0x100, + ARG_NO_PAGER + }; - fn = join("/run/log/journal/", ids, "/system.journal", NULL); - if (!fn) - return -ENOMEM; + static const struct option options[] = { + { "help", no_argument, NULL, 'h' }, + { "version" , no_argument, NULL, ARG_VERSION }, + { "no-pager", no_argument, NULL, ARG_NO_PAGER }, + { "follow", no_argument, NULL, 'f' }, + { "output", required_argument, NULL, 'o' }, + { "all", no_argument, NULL, 'a' }, + { "lines", required_argument, NULL, 'n' }, + { NULL, 0, NULL, 0 } + }; - r = journal_file_open(fn, O_RDONLY, 0640, NULL, f); - free(fn); + int c, r; - if (r < 0) { - log_error("Failed to open system journal: %s", strerror(-r)); - return r; + assert(argc >= 0); + assert(argv); + + while ((c = getopt_long(argc, argv, "hfo:an:", options, NULL)) >= 0) { + + switch (c) { + + case 'h': + help(); + return 0; + + case ARG_VERSION: + puts(PACKAGE_STRING); + puts(DISTRIBUTION); + puts(SYSTEMD_FEATURES); + return 0; + + case ARG_NO_PAGER: + arg_no_pager = true; + break; + + case 'f': + arg_follow = true; + break; + + case 'o': + if (streq(optarg, "short")) + arg_output = OUTPUT_SHORT; + else if (streq(optarg, "verbose")) + arg_output = OUTPUT_VERBOSE; + else if (streq(optarg, "export")) + arg_output = OUTPUT_EXPORT; + else if (streq(optarg, "json")) + arg_output = OUTPUT_JSON; + else { + log_error("Unknown output '%s'.", optarg); + return -EINVAL; + } + break; + + case 'a': + arg_show_all = true; + break; + + case 'n': + r = safe_atoi(optarg, &arg_lines); + if (r < 0) { + log_error("Failed to parse lines '%s'", optarg); + return -EINVAL; + } + break; + + case '?': + return -EINVAL; + + default: + log_error("Unknown option code %c", c); + return -EINVAL; + } } - return r; + return 1; } int main(int argc, char *argv[]) { - int r; - JournalFile *f; - Object *o = NULL; + int r, i, fd; + sd_journal *j = NULL; + unsigned line = 0; log_parse_environment(); log_open(); - r = system_journal_open(&f); + r = parse_argv(argc, argv); + if (r <= 0) + goto finish; + + r = sd_journal_open(&j, 0); if (r < 0) { log_error("Failed to open journal: %s", strerror(-r)); - return EXIT_FAILURE; + goto finish; } - for (;;) { - uint64_t offset; - uint64_t n, i; + for (i = optind; i < argc; i++) { + r = sd_journal_add_match(j, argv[i], strlen(argv[i])); + if (r < 0) { + log_error("Failed to add match: %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; + } - r = journal_file_next_entry(f, o, &o, &offset); + if (arg_lines >= 0) { + r = sd_journal_seek_tail(j); if (r < 0) { - log_error("Failed to read journal: %s", strerror(-r)); + log_error("Failed to seek to tail: %s", strerror(-r)); goto finish; } - if (r == 0) - break; + r = sd_journal_previous_skip(j, arg_lines); + if (r < 0) { + log_error("Failed to iterate through journal: %s", strerror(-r)); + goto finish; + } + } else { + r = sd_journal_seek_head(j); + if (r < 0) { + log_error("Failed to seek to head: %s", strerror(-r)); + goto finish; + } + } + + if (!arg_no_pager && !arg_follow) { + columns(); + pager_open(); + } + + if (arg_output == OUTPUT_JSON) { + fputc('[', stdout); + fflush(stdout); + } - printf("entry: %llu\n", (unsigned long long) le64toh(o->entry.seqnum)); + for (;;) { + struct pollfd pollfd; - n = journal_file_entry_n_items(o); - for (i = 0; i < n; i++) { - uint64_t p, l; + for (;;) { + r = sd_journal_next(j); - p = le64toh(o->entry.items[i].object_offset); - r = journal_file_move_to_object(f, p, OBJECT_DATA, &o); if (r < 0) { - log_error("Failed to move to data: %s", strerror(-r)); + log_error("Failed to iterate through journal: %s", strerror(-r)); goto finish; } - l = o->object.size - offsetof(Object, data.payload); - printf("\t[%.*s]\n", (int) l, o->data.payload); + if (r == 0) + break; - r = journal_file_move_to_object(f, offset, OBJECT_ENTRY, &o); - if (r < 0) { - log_error("Failed to move back to entry: %s", strerror(-r)); + line ++; + + r = output_journal(j, arg_output, line, arg_show_all); + if (r < 0) goto finish; - } + } + + if (!arg_follow) + break; + + zero(pollfd); + pollfd.fd = fd; + pollfd.events = POLLIN; + + if (poll(&pollfd, 1, -1) < 0) { + if (errno == EINTR) + break; + + log_error("poll(): %m"); + r = -errno; + goto finish; + } + + r = sd_journal_process(j); + if (r < 0) { + log_error("Failed to process: %s", strerror(-r)); + goto finish; } } + if (arg_output == OUTPUT_JSON) + fputs("\n]\n", stdout); + finish: - journal_file_close(f); + if (j) + sd_journal_close(j); - return 0; + pager_close(); + + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }