X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogs-show.c;h=a6220351b65c73403271a4abc8c86a52b1e37138;hp=358aea176ff20073d5a9124654fcd8d4bdeffcfc;hb=64661ee70d5a10c6208a1cb66ecd8b158e2d8bc5;hpb=55d7bfc19b72eca09d2bb7c9c73a62c886d8b9b4 diff --git a/src/logs-show.c b/src/logs-show.c index 358aea176..a6220351b 100644 --- a/src/logs-show.c +++ b/src/logs-show.c @@ -58,12 +58,15 @@ static int parse_field(const void *data, size_t length, const char *field, char return 0; nl = length - fl; - buf = memdup((const char*) data + fl, nl); + buf = malloc(nl+1); + memcpy(buf, (const char*) data + fl, nl); + ((char*)buf)[nl] = 0; if (!buf) { log_error("Out of memory"); return -ENOMEM; } + free(*target); *target = buf; *target_size = nl; @@ -83,17 +86,13 @@ static bool shall_print(bool show_all, char *p, size_t l) { return true; } -static int output_short(sd_journal *j, unsigned line, bool show_all) { +static int output_short(sd_journal *j, unsigned line, unsigned n_columns, bool show_all, bool monotonic_mode) { int r; - uint64_t realtime; - time_t t; - struct tm tm; - char buf[64]; const void *data; size_t length; size_t n = 0; - char *hostname = NULL, *tag = NULL, *comm = NULL, *pid = NULL, *message = NULL; - size_t hostname_len = 0, tag_len = 0, comm_len = 0, pid_len = 0, message_len = 0; + char *hostname = NULL, *identifier = NULL, *comm = NULL, *pid = NULL, *fake_pid = NULL, *message = NULL, *realtime = NULL, *monotonic = NULL; + size_t hostname_len = 0, identifier_len = 0, comm_len = 0, pid_len = 0, fake_pid_len = 0, message_len = 0, realtime_len = 0, monotonic_len = 0; assert(j); @@ -105,7 +104,7 @@ static int output_short(sd_journal *j, unsigned line, bool show_all) { else if (r > 0) continue; - r = parse_field(data, length, "SYSLOG_TAG=", &tag, &tag_len); + r = parse_field(data, length, "SYSLOG_IDENTIFIER=", &identifier, &identifier_len); if (r < 0) goto finish; else if (r > 0) @@ -123,6 +122,24 @@ static int output_short(sd_journal *j, unsigned line, bool show_all) { else if (r > 0) continue; + r = parse_field(data, length, "SYSLOG_PID=", &fake_pid, &fake_pid_len); + if (r < 0) + goto finish; + else if (r > 0) + continue; + + r = parse_field(data, length, "_SOURCE_REALTIME_TIMESTAMP=", &realtime, &realtime_len); + if (r < 0) + goto finish; + else if (r > 0) + continue; + + r = parse_field(data, length, "_SOURCE_MONOTONIC_TIMESTAMP=", &monotonic, &monotonic_len); + if (r < 0) + goto finish; + else if (r > 0) + continue; + r = parse_field(data, length, "MESSAGE=", &message, &message_len); if (r < 0) goto finish; @@ -133,29 +150,66 @@ static int output_short(sd_journal *j, unsigned line, bool show_all) { goto finish; } - r = sd_journal_get_realtime_usec(j, &realtime); - if (r < 0) { - log_error("Failed to get realtime: %s", strerror(-r)); - goto finish; - } + if (monotonic_mode) { + uint64_t t; + sd_id128_t boot_id; - 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."); - goto finish; - } + r = -ENOENT; + + if (monotonic) + r = safe_atou64(monotonic, &t); + + if (r < 0) + r = sd_journal_get_monotonic_usec(j, &t, &boot_id); + + if (r < 0) { + log_error("Failed to get monotonic: %s", strerror(-r)); + goto finish; + } + + printf("[%5llu.%06llu]", + (unsigned long long) (t / USEC_PER_SEC), + (unsigned long long) (t % USEC_PER_SEC)); + + n += 1 + 5 + 1 + 6 + 1; + + } else { + char buf[64]; + uint64_t x; + time_t t; + struct tm tm; + + r = -ENOENT; + + if (realtime) + r = safe_atou64(realtime, &x); + + if (r < 0) + r = sd_journal_get_realtime_usec(j, &x); - fputs(buf, stdout); - n += strlen(buf); + if (r < 0) { + log_error("Failed to get realtime: %s", strerror(-r)); + goto finish; + } + + t = (time_t) (x / USEC_PER_SEC); + if (strftime(buf, sizeof(buf), "%b %d %H:%M:%S", localtime_r(&t, &tm)) <= 0) { + log_error("Failed to format time."); + goto finish; + } + + fputs(buf, stdout); + n += strlen(buf); + } if (hostname && shall_print(show_all, hostname, hostname_len)) { printf(" %.*s", (int) hostname_len, hostname); n += hostname_len + 1; } - if (tag && shall_print(show_all, tag, tag_len)) { - printf(" %.*s", (int) tag_len, tag); - n += tag_len + 1; + if (identifier && shall_print(show_all, identifier, identifier_len)) { + printf(" %.*s", (int) identifier_len, identifier); + n += identifier_len + 1; } else if (comm && shall_print(show_all, comm, comm_len)) { printf(" %.*s", (int) comm_len, comm); n += comm_len + 1; @@ -164,23 +218,27 @@ static int output_short(sd_journal *j, unsigned line, bool show_all) { if (pid && shall_print(show_all, pid, pid_len)) { printf("[%.*s]", (int) pid_len, pid); n += pid_len + 2; + } else if (fake_pid && shall_print(show_all, fake_pid, fake_pid_len)) { + printf("[%.*s]", (int) fake_pid_len, fake_pid); + n += fake_pid_len + 2; } if (show_all) printf(": %.*s\n", (int) message_len, message); - else if (contains_unprintable(message, message_len)) - fputs(": [blob data]\n", stdout); - else if (message_len + n < columns()) + else if (contains_unprintable(message, message_len)) { + char bytes[FORMAT_BYTES_MAX]; + printf(": [%s blob data]\n", format_bytes(bytes, sizeof(bytes), message_len)); + } else if (message_len + n < n_columns) printf(": %.*s\n", (int) message_len, message); - else if (n < columns()) { + else if (n < n_columns) { char *e; - e = ellipsize_mem(message, message_len, columns() - n - 2, 90); + e = ellipsize_mem(message, message_len, n_columns - n - 2, 90); if (!e) printf(": %.*s\n", (int) message_len, message); else - printf(": %s", e); + printf(": %s\n", e); free(e); } else @@ -190,15 +248,26 @@ static int output_short(sd_journal *j, unsigned line, bool show_all) { finish: free(hostname); - free(tag); + free(identifier); free(comm); free(pid); + free(fake_pid); free(message); + free(monotonic); + free(realtime); return r; } -static int output_verbose(sd_journal *j, unsigned line, bool show_all) { +static int output_short_realtime(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) { + return output_short(j, line, n_columns, show_all, false); +} + +static int output_short_monotonic(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) { + return output_short(j, line, n_columns, show_all, true); +} + +static int output_verbose(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) { const void *data; size_t length; char *cursor; @@ -230,6 +299,7 @@ static int output_verbose(sd_journal *j, unsigned line, bool show_all) { if (!show_all && (length > PRINT_THRESHOLD || contains_unprintable(data, length))) { const char *c; + char bytes[FORMAT_BYTES_MAX]; c = memchr(data, '=', length); if (!c) { @@ -237,9 +307,10 @@ static int output_verbose(sd_journal *j, unsigned line, bool show_all) { return -EINVAL; } - printf("\t%.*s=[blob data]\n", + printf("\t%.*s=[%s blob data]\n", (int) (c - (const char*) data), - (const char*) data); + (const char*) data, + format_bytes(bytes, sizeof(bytes), length - (c - (const char *) data) - 1)); } else printf("\t%.*s\n", (int) length, (const char*) data); } @@ -247,7 +318,7 @@ static int output_verbose(sd_journal *j, unsigned line, bool show_all) { return 0; } -static int output_export(sd_journal *j, unsigned line, bool show_all) { +static int output_export(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) { sd_id128_t boot_id; char sid[33]; int r; @@ -276,10 +347,10 @@ static int output_export(sd_journal *j, unsigned line, bool show_all) { return r; } - printf(".cursor=%s\n" - ".realtime=%llu\n" - ".monotonic=%llu\n" - ".boot_id=%s\n", + printf("__CURSOR=%s\n" + "__REALTIME_TIMESTAMP=%llu\n" + "__MONOTONIC_TIMESTAMP=%llu\n" + "_BOOT_ID=%s\n", cursor, (unsigned long long) realtime, (unsigned long long) monotonic, @@ -289,6 +360,12 @@ static int output_export(sd_journal *j, unsigned line, bool show_all) { SD_JOURNAL_FOREACH_DATA(j, data, length) { + /* We already printed the boot id, from the data in + * the header, hence let's suppress it here */ + if (length >= 9 && + memcmp(data, "_BOOT_ID=", 9) == 0) + continue; + if (contains_unprintable(data, length)) { const char *c; uint64_t le64; @@ -353,7 +430,7 @@ static void json_escape(const char* p, size_t l) { } } -static int output_json(sd_journal *j, unsigned line, bool show_all) { +static int output_json(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) { uint64_t realtime, monotonic; char *cursor; const void *data; @@ -388,10 +465,10 @@ static int output_json(sd_journal *j, unsigned line, bool show_all) { fputs(",\n", stdout); printf("{\n" - "\t\".cursor\" : \"%s\",\n" - "\t\".realtime\" : %llu,\n" - "\t\".monotonic\" : %llu,\n" - "\t\".boot_id\" : \"%s\"", + "\t\"__CURSOR\" : \"%s\",\n" + "\t\"__REALTIME_TIMESTAMP\" : \"%llu\",\n" + "\t\"__MONOTONIC_TIMESTAMP\" : \"%llu\",\n" + "\t\"_BOOT_ID\" : \"%s\"", cursor, (unsigned long long) realtime, (unsigned long long) monotonic, @@ -402,6 +479,12 @@ static int output_json(sd_journal *j, unsigned line, bool show_all) { SD_JOURNAL_FOREACH_DATA(j, data, length) { const char *c; + /* We already printed the boot id, from the data in + * the header, hence let's suppress it here */ + if (length >= 9 && + memcmp(data, "_BOOT_ID=", 9) == 0) + continue; + c = memchr(data, '=', length); if (!c) { log_error("Invalid field."); @@ -420,24 +503,49 @@ static int output_json(sd_journal *j, unsigned line, bool show_all) { return 0; } -static int (*output_funcs[_OUTPUT_MODE_MAX])(sd_journal*j, unsigned line, bool show_all) = { - [OUTPUT_SHORT] = output_short, +static int output_cat(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) { + const void *data; + size_t l; + int r; + + assert(j); + + r = sd_journal_get_data(j, "MESSAGE", &data, &l); + if (r < 0) { + log_error("Failed to get data: %s", strerror(-r)); + return r; + } + + assert(l >= 8); + + fwrite((const char*) data + 8, 1, l - 8, stdout); + putchar('\n'); + + return 0; +} + +static int (*output_funcs[_OUTPUT_MODE_MAX])(sd_journal*j, unsigned line, unsigned n_columns, bool show_all) = { + [OUTPUT_SHORT] = output_short_realtime, + [OUTPUT_SHORT_MONOTONIC] = output_short_monotonic, [OUTPUT_VERBOSE] = output_verbose, [OUTPUT_EXPORT] = output_export, - [OUTPUT_JSON] = output_json + [OUTPUT_JSON] = output_json, + [OUTPUT_CAT] = output_cat }; -int output_journal(sd_journal *j, OutputMode mode, unsigned line, bool show_all) { +int output_journal(sd_journal *j, OutputMode mode, unsigned line, unsigned n_columns, bool show_all) { assert(mode >= 0); assert(mode < _OUTPUT_MODE_MAX); - return output_funcs[mode](j, line, show_all); + if (n_columns <= 0) + n_columns = columns(); + + return output_funcs[mode](j, line, n_columns, show_all); } int show_journal_by_unit( const char *unit, OutputMode mode, - const char *prefix, unsigned n_columns, usec_t not_before, unsigned how_many, @@ -464,12 +572,6 @@ int show_journal_by_unit( if (how_many <= 0) return 0; - if (n_columns <= 0) - n_columns = columns(); - - if (!prefix) - prefix = ""; - if (asprintf(&m, "_SYSTEMD_UNIT=%s", unit) < 0) { r = -ENOMEM; goto finish; @@ -531,7 +633,7 @@ int show_journal_by_unit( line ++; - r = output_journal(j, mode, line, show_all); + r = output_journal(j, mode, line, n_columns, show_all); if (r < 0) goto finish; } @@ -539,7 +641,7 @@ int show_journal_by_unit( if (!follow) break; - r = fd_wait_for_event(fd, POLLIN); + r = fd_wait_for_event(fd, POLLIN, (usec_t) -1); if (r < 0) goto finish; @@ -564,9 +666,11 @@ finish: static const char *const output_mode_table[_OUTPUT_MODE_MAX] = { [OUTPUT_SHORT] = "short", + [OUTPUT_SHORT_MONOTONIC] = "short-monotonic", [OUTPUT_VERBOSE] = "verbose", [OUTPUT_EXPORT] = "export", - [OUTPUT_JSON] = "json" + [OUTPUT_JSON] = "json", + [OUTPUT_CAT] = "cat" }; DEFINE_STRING_TABLE_LOOKUP(output_mode, OutputMode);