X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=9d4403267eb8aa22b6b7c113783accad468bf6fc;hp=da4f51021d87853df227d08a52395d9f1a068442;hb=e51240886f54e0128b1711c7dd0454b23e3f7d5e;hpb=cf244689e9d1ab50082c9ddd0f3c4d1eb982badc
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index da4f51021..9d4403267 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -6,16 +6,16 @@
Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
@@ -29,336 +29,43 @@
#include
#include
#include
+#include
+
+#include
-#include "sd-journal.h"
#include "log.h"
#include "util.h"
+#include "path-util.h"
#include "build.h"
#include "pager.h"
+#include "logs-show.h"
-#define PRINT_THRESHOLD 128
-
-static enum {
- OUTPUT_SHORT,
- OUTPUT_VERBOSE,
- OUTPUT_EXPORT,
- OUTPUT_JSON,
- _OUTPUT_MAX
-} 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 bool contains_unprintable(const void *p, size_t l) {
- const char *j;
-
- for (j = p; j < (const char *) p + l; j++)
- if (*j < ' ' || *j >= 127)
- return true;
-
- return false;
-}
-
-static int output_short(sd_journal *j, unsigned line) {
- int r;
- uint64_t realtime;
- time_t t;
- struct tm tm;
- char buf[64];
- const void *data;
- size_t length;
- size_t n = 0;
-
- assert(j);
-
- r = sd_journal_get_realtime_usec(j, &realtime);
- if (r < 0) {
- log_error("Failed to get realtime: %s", strerror(-r));
- return r;
- }
-
- t = (time_t) (realtime / USEC_PER_SEC);
- if (strftime(buf, sizeof(buf), "%b %d %H:%M:%S", localtime_r(&t, &tm)) <= 0) {
- log_error("Failed to format time.");
- return -EINVAL;
- }
-
- fputs(buf, stdout);
- n += strlen(buf);
-
- if (sd_journal_get_data(j, "_HOSTNAME", &data, &length) >= 0 &&
- (arg_show_all || (!contains_unprintable(data, length) &&
- length < PRINT_THRESHOLD))) {
- printf(" %.*s", (int) length - 10, ((const char*) data) + 10);
- n += length - 10 + 1;
- }
-
- if (sd_journal_get_data(j, "MESSAGE", &data, &length) >= 0) {
- if (arg_show_all)
- printf(" %.*s", (int) length - 8, ((const char*) data) + 8);
- else if (contains_unprintable(data, length))
- fputs(" [blob data]", stdout);
- else if (length - 8 + n < columns())
- printf(" %.*s", (int) length - 8, ((const char*) data) + 8);
- else if (n < columns()) {
- char *e;
-
- e = ellipsize_mem((const char *) data + 8, length - 8, columns() - n - 2, 90);
-
- if (!e)
- printf(" %.*s", (int) length - 8, ((const char*) data) + 8);
- else
- printf(" %s", e);
-
- free(e);
- }
- }
-
- fputc('\n', stdout);
-
- return 0;
-}
-
-static int output_verbose(sd_journal *j, unsigned line) {
- const void *data;
- size_t length;
- char *cursor;
- uint64_t realtime;
- char ts[FORMAT_TIMESTAMP_MAX];
- int r;
-
- assert(j);
-
- r = sd_journal_get_realtime_usec(j, &realtime);
- if (r < 0) {
- log_error("Failed to get realtime timestamp: %s", strerror(-r));
- return r;
- }
-
- r = sd_journal_get_cursor(j, &cursor);
- if (r < 0) {
- log_error("Failed to get cursor: %s", strerror(-r));
- return r;
- }
-
- printf("%s [%s]\n",
- format_timestamp(ts, sizeof(ts), realtime),
- cursor);
-
- free(cursor);
-
- SD_JOURNAL_FOREACH_DATA(j, data, length) {
- if (!arg_show_all && (length > PRINT_THRESHOLD ||
- contains_unprintable(data, length))) {
- const char *c;
-
- c = memchr(data, '=', length);
- if (!c) {
- log_error("Invalid field.");
- return -EINVAL;
- }
-
- printf("\t%.*s=[blob data]\n",
- (int) (c - (const char*) data),
- (const char*) data);
- } else
- printf("\t%.*s\n", (int) length, (const char*) data);
- }
-
- return 0;
-}
-
-static int output_export(sd_journal *j, unsigned line) {
- sd_id128_t boot_id;
- char sid[33];
- int r;
- usec_t realtime, monotonic;
- char *cursor;
- const void *data;
- size_t length;
-
- assert(j);
-
- r = sd_journal_get_realtime_usec(j, &realtime);
- if (r < 0) {
- log_error("Failed to get realtime timestamp: %s", strerror(-r));
- return r;
- }
-
- r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
- if (r < 0) {
- log_error("Failed to get monotonic timestamp: %s", strerror(-r));
- return r;
- }
-
- r = sd_journal_get_cursor(j, &cursor);
- if (r < 0) {
- log_error("Failed to get cursor: %s", strerror(-r));
- return r;
- }
-
- printf(".cursor=%s\n"
- ".realtime=%llu\n"
- ".monotonic=%llu\n"
- ".boot_id=%s\n",
- cursor,
- (unsigned long long) realtime,
- (unsigned long long) monotonic,
- sd_id128_to_string(boot_id, sid));
-
- free(cursor);
-
- SD_JOURNAL_FOREACH_DATA(j, data, length) {
-
- if (contains_unprintable(data, length)) {
- const char *c;
- uint64_t le64;
-
- c = memchr(data, '=', length);
- if (!c) {
- log_error("Invalid field.");
- return -EINVAL;
- }
-
- fwrite(data, c - (const char*) data, 1, stdout);
- fputc('\n', stdout);
- le64 = htole64(length - (c - (const char*) data) - 1);
- fwrite(&le64, sizeof(le64), 1, stdout);
- fwrite(c + 1, length - (c - (const char*) data) - 1, 1, stdout);
- } else
- fwrite(data, length, 1, stdout);
-
- fputc('\n', stdout);
- }
-
- fputc('\n', stdout);
-
- return 0;
-}
-
-static void json_escape(const char* p, size_t l) {
-
- if (contains_unprintable(p, l)) {
- bool not_first = false;
-
- fputs("[ ", stdout);
-
- while (l > 0) {
- if (not_first)
- printf(", %u", (uint8_t) *p);
- else {
- not_first = true;
- printf("%u", (uint8_t) *p);
- }
-
- p++;
- l--;
- }
-
- fputs(" ]", stdout);
- } else {
- fputc('\"', stdout);
-
- while (l > 0) {
- if (*p == '"' || *p == '\\') {
- fputc('\\', stdout);
- fputc(*p, stdout);
- } else
- fputc(*p, stdout);
-
- p++;
- l--;
- }
-
- fputc('\"', stdout);
- }
-}
-
-static int output_json(sd_journal *j, unsigned line) {
- uint64_t realtime, monotonic;
- char *cursor;
- const void *data;
- size_t length;
- sd_id128_t boot_id;
- char sid[33];
- int r;
-
- assert(j);
-
- r = sd_journal_get_realtime_usec(j, &realtime);
- if (r < 0) {
- log_error("Failed to get realtime timestamp: %s", strerror(-r));
- return r;
- }
-
- r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
- if (r < 0) {
- log_error("Failed to get monotonic timestamp: %s", strerror(-r));
- return r;
- }
-
- r = sd_journal_get_cursor(j, &cursor);
- if (r < 0) {
- log_error("Failed to get cursor: %s", strerror(-r));
- return r;
- }
-
- if (line == 1)
- fputc('\n', stdout);
- else
- fputs(",\n", stdout);
-
- printf("{\n"
- "\t\".cursor\" : \"%s\",\n"
- "\t\".realtime\" : %llu,\n"
- "\t\".monotonic\" : %llu,\n"
- "\t\".boot_id\" : \"%s\"",
- cursor,
- (unsigned long long) realtime,
- (unsigned long long) monotonic,
- sd_id128_to_string(boot_id, sid));
-
- free(cursor);
-
- SD_JOURNAL_FOREACH_DATA(j, data, length) {
- const char *c;
-
- c = memchr(data, '=', length);
- if (!c) {
- log_error("Invalid field.");
- return -EINVAL;
- }
-
- fputs(",\n\t", stdout);
- json_escape(data, c - (const char*) data);
- fputs(" : ", stdout);
- json_escape(c + 1, length - (c - (const char*) data) - 1);
- }
-
- fputs("\n}", stdout);
- fflush(stdout);
-
- return 0;
-}
-
-static int (*output_funcs[_OUTPUT_MAX])(sd_journal*j, unsigned line) = {
- [OUTPUT_SHORT] = output_short,
- [OUTPUT_VERBOSE] = output_verbose,
- [OUTPUT_EXPORT] = output_export,
- [OUTPUT_JSON] = output_json
-};
+static int arg_lines = -1;
+static bool arg_no_tail = false;
+static bool arg_new_id128 = false;
+static bool arg_quiet = false;
+static bool arg_local = false;
static int help(void) {
- printf("%s [OPTIONS...] {COMMAND} ...\n\n"
- "Send control commands to or query the login manager.\n\n"
+ printf("%s [OPTIONS...] [MATCH]\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"
+ " -a --all Show all fields, 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,\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",
program_invocation_short_name);
return 0;
@@ -368,7 +75,9 @@ static int parse_argv(int argc, char *argv[]) {
enum {
ARG_VERSION = 0x100,
- ARG_NO_PAGER
+ ARG_NO_PAGER,
+ ARG_NO_TAIL,
+ ARG_NEW_ID128
};
static const struct option options[] = {
@@ -378,15 +87,20 @@ static int parse_argv(int argc, char *argv[]) {
{ "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 },
+ { "quiet", no_argument, NULL, 'q' },
+ { "local", no_argument, NULL, 'l' },
{ 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:ql", options, NULL)) >= 0) {
switch (c) {
@@ -409,24 +123,42 @@ static int parse_argv(int argc, char *argv[]) {
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 'q':
+ arg_quiet = true;
+ break;
+
+ case 'l':
+ arg_local = true;
+ break;
+
case '?':
return -EINVAL;
@@ -436,16 +168,46 @@ static int parse_argv(int argc, char *argv[]) {
}
}
+ if (arg_follow && !arg_no_tail && arg_lines < 0)
+ 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;
-
- log_set_max_level(LOG_DEBUG);
- log_set_target(LOG_TARGET_CONSOLE);
+ bool need_seek = false;
+ struct stat st;
log_parse_environment();
log_open();
@@ -454,14 +216,59 @@ int main(int argc, char *argv[]) {
if (r <= 0)
goto finish;
- r = sd_journal_open(&j, 0);
+ 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;
}
for (i = optind; i < argc; i++) {
- r = sd_journal_add_match(j, argv[i], strlen(argv[i]));
+ if (path_is_absolute(argv[i])) {
+ char *p = NULL;
+ const char *path;
+
+ p = canonicalize_file_name(argv[i]);
+ path = p ? p : argv[i];
+
+ if (stat(path, &st) < 0) {
+ free(p);
+ log_error("Couldn't stat file: %m");
+ r = -errno;
+ goto finish;
+ }
+
+ 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");
+ goto finish;
+ }
+
+ r = sd_journal_add_match(j, t, strlen(t));
+ free(t);
+ } else {
+ free(p);
+ log_error("File is not a regular file or is not executable: %s", argv[i]);
+ goto finish;
+ }
+
+ free(p);
+ } else
+ 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;
@@ -474,9 +281,26 @@ int main(int argc, char *argv[]) {
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;
}
@@ -491,14 +315,13 @@ int main(int argc, char *argv[]) {
}
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)
@@ -506,24 +329,19 @@ int main(int argc, char *argv[]) {
line ++;
- r = output_funcs[arg_output](j, line);
+ r = output_journal(j, arg_output, line, 0, 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, (usec_t) -1);
+ if (r < 0) {
+ log_error("Couldn't wait for event: %s", strerror(-r));
goto finish;
}