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=3e5ee1af967dd1244ef4747bb9bd0b253cf2b77a;hpb=8725d60ae4f7a8471aa8a0207fa105e335d069a6;p=elogind.git diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 3e5ee1af9..fc1fed277 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -26,27 +26,143 @@ #include #include #include +#include +#include +#include #include "sd-journal.h" #include "log.h" +#include "util.h" +#include "build.h" +#include "pager.h" +#include "logs-show.h" + +static output_mode arg_output = OUTPUT_SHORT; + +static bool arg_follow = false; +static bool arg_show_all = false; +static bool arg_no_pager = false; +static int arg_lines = -1; + +static int help(void) { + + 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); + + return 0; +} + +static int parse_argv(int argc, char *argv[]) { + + enum { + ARG_VERSION = 0x100, + ARG_NO_PAGER + }; + + 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 } + }; + + int c, 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 1; +} int main(int argc, char *argv[]) { - int r, i; + int r, i, fd; sd_journal *j = NULL; - - log_set_max_level(LOG_DEBUG); - log_set_target(LOG_TARGET_CONSOLE); + unsigned line = 0; log_parse_environment(); log_open(); - r = sd_journal_open(&j); + 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)); goto finish; } - for (i = 1; i < argc; 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)); @@ -54,37 +170,94 @@ int main(int argc, char *argv[]) { } } - SD_JOURNAL_FOREACH_BEGIN(j) { + fd = sd_journal_get_fd(j); + if (fd < 0) { + log_error("Failed to get wakeup fd: %s", strerror(-fd)); + goto finish; + } - const void *data; - size_t length; - char *cursor; - uint64_t realtime = 0, monotonic = 0; + if (arg_lines >= 0) { + r = sd_journal_seek_tail(j); + if (r < 0) { + log_error("Failed to seek to tail: %s", strerror(-r)); + goto finish; + } - r = sd_journal_get_cursor(j, &cursor); + 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 get cursor: %s", strerror(-r)); + log_error("Failed to seek to head: %s", strerror(-r)); goto finish; } + } + + if (!arg_no_pager && !arg_follow) { + columns(); + pager_open(); + } - printf("entry: %s\n", cursor); - free(cursor); + if (arg_output == OUTPUT_JSON) { + fputc('[', stdout); + fflush(stdout); + } - sd_journal_get_realtime_usec(j, &realtime); - sd_journal_get_monotonic_usec(j, &monotonic); - printf("realtime: %llu\n" - "monotonic: %llu\n", - (unsigned long long) realtime, - (unsigned long long) monotonic); + for (;;) { + struct pollfd pollfd; - SD_JOURNAL_FOREACH_DATA(j, data, length) - printf("\t%.*s\n", (int) length, (const char*) data); + for (;;) { + r = sd_journal_next(j); - } SD_JOURNAL_FOREACH_END(j); + if (r < 0) { + log_error("Failed to iterate through journal: %s", strerror(-r)); + goto finish; + } + + if (r == 0) + break; + + 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: if (j) sd_journal_close(j); + pager_close(); + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }