#include <time.h>
#include <getopt.h>
-#include "sd-journal.h"
+#include <systemd/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 OutputMode 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 bool arg_no_tail = false;
+static bool arg_new_id128 = false;
static int help(void) {
printf("%s [OPTIONS...] {COMMAND} ...\n\n"
- "Send control commands to or query the login manager.\n\n"
+ "Send control commands to or query the journal.\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"
- " -o --output=STRING Change output mode (short, verbose, export, json)\n",
+ " -n --lines=INTEGER Journal entries to show\n"
+ " --no-tail Show all lines, even in follow mode\n"
+ " -o --output=STRING Change journal output mode (short, short-monotonic, verbose, export, json)\n"
+ " --new-id128 Generate a new 128 Bit id\n",
program_invocation_short_name);
return 0;
enum {
ARG_VERSION = 0x100,
- ARG_NO_PAGER
+ ARG_NO_PAGER,
+ ARG_NO_TAIL,
+ ARG_NEW_ID128
};
static const struct option options[] = {
{ "follow", no_argument, NULL, 'f' },
{ "output", required_argument, NULL, 'o' },
{ "all", no_argument, NULL, 'a' },
+ { "lines", required_argument, NULL, 'n' },
+ { "no-tail", no_argument, NULL, ARG_NO_TAIL },
+ { "new-id128", no_argument, NULL, ARG_NEW_ID128 },
{ NULL, 0, NULL, 0 }
};
- int c;
+ int c, r;
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "hfo:a", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hfo:an:", options, NULL)) >= 0) {
switch (c) {
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 {
+ arg_output = output_mode_from_string(optarg);
+ if (arg_output < 0) {
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 || arg_lines < 0) {
+ log_error("Failed to parse lines '%s'", optarg);
+ return -EINVAL;
+ }
+ break;
+
+ case ARG_NO_TAIL:
+ arg_no_tail = true;
+ break;
+
+ case ARG_NEW_ID128:
+ arg_new_id128 = true;
+ break;
+
case '?':
return -EINVAL;
}
}
+ if (arg_follow && !arg_no_tail)
+ arg_lines = 10;
+
return 1;
}
+static int generate_new_id128(void) {
+ sd_id128_t id;
+ int r;
+ unsigned i;
+
+ r = sd_id128_randomize(&id);
+ if (r < 0) {
+ log_error("Failed to generate ID: %s", strerror(-r));
+ return r;
+ }
+
+ printf("As string:\n"
+ SD_ID128_FORMAT_STR "\n\n"
+ "As UUID:\n"
+ "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n\n"
+ "As macro:\n"
+ "#define MESSAGE_XYZ SD_ID128_MAKE(",
+ SD_ID128_FORMAT_VAL(id),
+ SD_ID128_FORMAT_VAL(id));
+
+ for (i = 0; i < 16; i++)
+ printf("%02x%s", id.bytes[i], i != 15 ? "," : "");
+
+ fputs(")\n", stdout);
+
+ return 0;
+}
+
int main(int argc, char *argv[]) {
int r, i, fd;
sd_journal *j = NULL;
unsigned line = 0;
+ bool need_seek = false;
log_parse_environment();
log_open();
if (r <= 0)
goto finish;
+ if (arg_new_id128) {
+ r = generate_new_id128();
+ goto finish;
+ }
+
r = sd_journal_open(&j, 0);
if (r < 0) {
log_error("Failed to open journal: %s", strerror(-r));
goto finish;
}
- r = sd_journal_seek_head(j);
+ 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_previous_skip(j, arg_lines);
+ } else {
+ r = sd_journal_seek_head(j);
+ if (r < 0) {
+ log_error("Failed to seek to head: %s", strerror(-r));
+ goto finish;
+ }
+
+ r = sd_journal_next(j);
+ }
+
if (r < 0) {
- log_error("Failed to seek to head: %s", strerror(-r));
+ log_error("Failed to iterate through journal: %s", strerror(-r));
goto finish;
}
}
for (;;) {
- struct pollfd pollfd;
-
for (;;) {
- r = sd_journal_next(j);
-
- if (r < 0) {
- log_error("Failed to iterate through journal: %s", strerror(-r));
- goto finish;
+ if (need_seek) {
+ r = sd_journal_next(j);
+ if (r < 0) {
+ log_error("Failed to iterate through journal: %s", strerror(-r));
+ goto finish;
+ }
}
if (r == 0)
r = output_journal(j, arg_output, line, arg_show_all);
if (r < 0)
goto finish;
+
+ need_seek = true;
}
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;
+ r = fd_wait_for_event(fd, POLLIN);
+ if (r < 0) {
+ log_error("Couldn't wait for event: %s", strerror(-r));
goto finish;
}
~ianmdlvl / elogind.git / blobdiff