X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=62931f14c9bb71d7a886ff6bd66acbdde775b90a;hp=c44be745b861568f68a00391ec7ac19f602d4cdd;hb=11689d2a021d95a8447d938180e0962cd9439763;hpb=4561be3a64534a911ee405ffb51950a624a0cd3f diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index c44be745b..62931f14c 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -30,8 +31,10 @@ #include #include #include +#include #include #include +#include #include #ifdef HAVE_ACL @@ -39,7 +42,8 @@ #include "acl-util.h" #endif -#include +#include "sd-journal.h" +#include "sd-bus.h" #include "log.h" #include "logs-show.h" @@ -49,29 +53,43 @@ #include "build.h" #include "pager.h" #include "strv.h" +#include "set.h" +#include "sigbus.h" #include "journal-internal.h" #include "journal-def.h" #include "journal-verify.h" #include "journal-authenticate.h" #include "journal-qrcode.h" +#include "journal-vacuum.h" #include "fsprg.h" #include "unit-name.h" #include "catalog.h" +#include "mkdir.h" +#include "bus-util.h" +#include "bus-error.h" #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) +enum { + /* Special values for arg_lines */ + ARG_LINES_DEFAULT = -2, + ARG_LINES_ALL = -1, +}; + static OutputMode arg_output = OUTPUT_SHORT; +static bool arg_utc = false; static bool arg_pager_end = false; static bool arg_follow = false; static bool arg_full = true; static bool arg_all = false; static bool arg_no_pager = false; -static int arg_lines = -1; +static int arg_lines = ARG_LINES_DEFAULT; static bool arg_no_tail = false; static bool arg_quiet = false; static bool arg_merge = false; static bool arg_boot = false; -static char *arg_boot_descriptor = NULL; +static sd_id128_t arg_boot_id = {}; +static int arg_boot_offset = 0; static bool arg_dmesg = false; static const char *arg_cursor = NULL; static const char *arg_after_cursor = NULL; @@ -86,6 +104,7 @@ static bool arg_force = false; #endif static usec_t arg_since, arg_until; static bool arg_since_set = false, arg_until_set = false; +static char **arg_syslog_identifier = NULL; static char **arg_system_units = NULL; static char **arg_user_units = NULL; static const char *arg_field = NULL; @@ -93,6 +112,9 @@ static bool arg_catalog = false; static bool arg_reverse = false; static int arg_journal_type = 0; static const char *arg_root = NULL; +static const char *arg_machine = NULL; +static off_t arg_vacuum_size = (off_t) -1; +static usec_t arg_vacuum_time = USEC_INFINITY; static enum { ACTION_SHOW, @@ -105,6 +127,8 @@ static enum { ACTION_DUMP_CATALOG, ACTION_UPDATE_CATALOG, ACTION_LIST_BOOTS, + ACTION_FLUSH, + ACTION_VACUUM, } arg_action = ACTION_SHOW; typedef struct boot_id_t { @@ -113,36 +137,92 @@ typedef struct boot_id_t { uint64_t last; } boot_id_t; -static int help(void) { +static void pager_open_if_enabled(void) { + + if (arg_no_pager) + return; + + pager_open(arg_pager_end); +} + +static char *format_timestamp_maybe_utc(char *buf, size_t l, usec_t t) { + + if (arg_utc) + return format_timestamp_utc(buf, l, t); + + return format_timestamp(buf, l, t); +} + +static int parse_boot_descriptor(const char *x, sd_id128_t *boot_id, int *offset) { + sd_id128_t id = SD_ID128_NULL; + int off = 0, r; + + if (strlen(x) >= 32) { + char *t; + + t = strndupa(x, 32); + r = sd_id128_from_string(t, &id); + if (r >= 0) + x += 32; + + if (*x != '-' && *x != '+' && *x != 0) + return -EINVAL; + + if (*x != 0) { + r = safe_atoi(x, &off); + if (r < 0) + return r; + } + } else { + r = safe_atoi(x, &off); + if (r < 0) + return r; + } + + if (boot_id) + *boot_id = id; + + if (offset) + *offset = off; + + return 0; +} + +static void help(void) { + + pager_open_if_enabled(); printf("%s [OPTIONS...] [MATCHES...]\n\n" "Query the journal.\n\n" "Flags:\n" - " --system Show only the system journal\n" - " --user Show only the user journal for current user\n" - " --since=DATE Start showing entries newer or of the specified date\n" - " --until=DATE Stop showing entries older or of the specified date\n" - " -c --cursor=CURSOR Start showing entries from specified cursor\n" - " --after-cursor=CURSOR Start showing entries from specified cursor\n" + " --system Show the system journal\n" + " --user Show the user journal for the current user\n" + " -M --machine=CONTAINER Operate on local container\n" + " --since=DATE Start showing entries on or newer than the specified date\n" + " --until=DATE Stop showing entries on or newer than the specified date\n" + " -c --cursor=CURSOR Start showing entries from the specified cursor\n" + " --after-cursor=CURSOR Start showing entries from after the specified cursor\n" " --show-cursor Print the cursor after all the entries\n" - " -b --boot[=ID] Show data only from ID or current boot if unspecified\n" + " -b --boot[=ID] Show data only from ID or, if unspecified, the current boot\n" " --list-boots Show terse information about recorded boots\n" - " -k --dmesg Show kernel message log from current boot\n" + " -k --dmesg Show kernel message log from the current boot\n" " -u --unit=UNIT Show data only from the specified unit\n" " --user-unit=UNIT Show data only from the specified user session unit\n" + " -t --identifier=STRING Show only messages with the specified syslog identifier\n" " -p --priority=RANGE Show only messages within the specified priority range\n" " -e --pager-end Immediately jump to end of the journal in the pager\n" - " -f --follow Follow journal\n" + " -f --follow Follow the journal\n" " -n --lines[=INTEGER] Number of journal entries to show\n" " --no-tail Show all lines, even in follow mode\n" " -r --reverse Show the newest entries first\n" " -o --output=STRING Change journal output mode (short, short-iso,\n" - " short-precise, short-monotonic, verbose,\n" - " export, json, json-pretty, json-sse, cat)\n" + " short-precise, short-monotonic, verbose,\n" + " export, json, json-pretty, json-sse, cat)\n" + " --utc Express time in Coordinated Universal Time (UTC)\n" " -x --catalog Add message explanations where available\n" " --no-full Ellipsize fields\n" " -a --all Show all fields, including long and unprintable\n" - " -q --quiet Don't show privilege warning\n" + " -q --quiet Do not show privilege warning\n" " --no-pager Do not pipe output into a pager\n" " -m --merge Show entries from all available journals\n" " -D --directory=PATH Show journal files from directory\n" @@ -151,25 +231,26 @@ static int help(void) { #ifdef HAVE_GCRYPT " --interval=TIME Time interval for changing the FSS sealing key\n" " --verify-key=KEY Specify FSS verification key\n" - " --force Force overriding new FSS key pair with --setup-keys\n" + " --force Force overriding of the FSS key pair with --setup-keys\n" #endif "\nCommands:\n" - " -h --help Show this help\n" + " -h --help Show this help text\n" " --version Show package version\n" - " --new-id128 Generate a new 128 Bit ID\n" + " -F --field=FIELD List all values that a specified field takes\n" + " --new-id128 Generate a new 128-bit ID\n" + " --disk-usage Show total disk usage of all journal files\n" + " --vacuum-size=BYTES Remove old journals until disk space drops below size\n" + " --vacuum-time=TIME Remove old journals until none left older than\n" + " --flush Flush all journal data from /run into /var\n" " --header Show journal header information\n" - " --disk-usage Show total disk usage\n" - " -F --field=FIELD List all values a certain field takes\n" " --list-catalog Show message IDs of all entries in the message catalog\n" " --dump-catalog Show entries in the message catalog\n" " --update-catalog Update the message catalog database\n" #ifdef HAVE_GCRYPT - " --setup-keys Generate new FSS key pair\n" + " --setup-keys Generate a new FSS key pair\n" " --verify Verify journal file consistency\n" #endif , program_invocation_short_name); - - return 0; } static int parse_argv(int argc, char *argv[]) { @@ -200,6 +281,10 @@ static int parse_argv(int argc, char *argv[]) { ARG_DUMP_CATALOG, ARG_UPDATE_CATALOG, ARG_FORCE, + ARG_UTC, + ARG_FLUSH, + ARG_VACUUM_SIZE, + ARG_VACUUM_TIME, }; static const struct option options[] = { @@ -228,6 +313,7 @@ static int parse_argv(int argc, char *argv[]) { { "file", required_argument, NULL, ARG_FILE }, { "root", required_argument, NULL, ARG_ROOT }, { "header", no_argument, NULL, ARG_HEADER }, + { "identifier", required_argument, NULL, 't' }, { "priority", required_argument, NULL, 'p' }, { "setup-keys", no_argument, NULL, ARG_SETUP_KEYS }, { "interval", required_argument, NULL, ARG_INTERVAL }, @@ -247,6 +333,11 @@ static int parse_argv(int argc, char *argv[]) { { "dump-catalog", no_argument, NULL, ARG_DUMP_CATALOG }, { "update-catalog", no_argument, NULL, ARG_UPDATE_CATALOG }, { "reverse", no_argument, NULL, 'r' }, + { "machine", required_argument, NULL, 'M' }, + { "utc", no_argument, NULL, ARG_UTC }, + { "flush", no_argument, NULL, ARG_FLUSH }, + { "vacuum-size", required_argument, NULL, ARG_VACUUM_SIZE }, + { "vacuum-time", required_argument, NULL, ARG_VACUUM_TIME }, {} }; @@ -255,12 +346,13 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "hefo:aln::qmb::kD:p:c:u:F:xr", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "hefo:aln::qmb::kD:p:c:t:u:F:xrM:", options, NULL)) >= 0) switch (c) { case 'h': - return help(); + help(); + return 0; case ARG_VERSION: puts(PACKAGE_STRING); @@ -274,7 +366,7 @@ static int parse_argv(int argc, char *argv[]) { case 'e': arg_pager_end = true; - if (arg_lines < 0) + if (arg_lines == ARG_LINES_DEFAULT) arg_lines = 1000; break; @@ -313,29 +405,33 @@ static int parse_argv(int argc, char *argv[]) { case 'n': if (optarg) { - r = safe_atoi(optarg, &arg_lines); - if (r < 0 || arg_lines < 0) { - log_error("Failed to parse lines '%s'", optarg); - return -EINVAL; + if (streq(optarg, "all")) + arg_lines = ARG_LINES_ALL; + else { + r = safe_atoi(optarg, &arg_lines); + if (r < 0 || arg_lines < 0) { + log_error("Failed to parse lines '%s'", optarg); + return -EINVAL; + } } } else { - int n; + arg_lines = 10; /* Hmm, no argument? Maybe the next * word on the command line is * supposed to be the argument? Let's * see if there is one, and is - * parsable as a positive - * integer... */ - - if (optind < argc && - safe_atoi(argv[optind], &n) >= 0 && - n >= 0) { - - arg_lines = n; - optind++; - } else - arg_lines = 10; + * parsable. */ + if (optind < argc) { + int n; + if (streq(argv[optind], "all")) { + arg_lines = ARG_LINES_ALL; + optind++; + } else if (safe_atoi(argv[optind], &n) >= 0 && n >= 0) { + arg_lines = n; + optind++; + } + } } break; @@ -359,16 +455,23 @@ static int parse_argv(int argc, char *argv[]) { case 'b': arg_boot = true; - if (optarg) - arg_boot_descriptor = optarg; - else if (optind < argc) { - int boot; + if (optarg) { + r = parse_boot_descriptor(optarg, &arg_boot_id, &arg_boot_offset); + if (r < 0) { + log_error("Failed to parse boot descriptor '%s'", optarg); + return -EINVAL; + } + } else { + + /* Hmm, no argument? Maybe the next + * word on the command line is + * supposed to be the argument? Let's + * see if there is one and is parsable + * as a boot descriptor... */ - if (argv[optind][0] != '-' || - safe_atoi(argv[optind], &boot) >= 0) { - arg_boot_descriptor = argv[optind]; + if (optind < argc && + parse_boot_descriptor(argv[optind], &arg_boot_id, &arg_boot_offset) >= 0) optind++; - } } break; @@ -389,16 +492,18 @@ static int parse_argv(int argc, char *argv[]) { arg_journal_type |= SD_JOURNAL_CURRENT_USER; break; + case 'M': + arg_machine = optarg; + break; + case 'D': arg_directory = optarg; break; case ARG_FILE: r = glob_extend(&arg_file, optarg); - if (r < 0) { - log_error("Failed to add paths: %s", strerror(-r)); - return r; - }; + if (r < 0) + return log_error_errno(r, "Failed to add paths: %m"); break; case ARG_ROOT: @@ -429,6 +534,26 @@ static int parse_argv(int argc, char *argv[]) { arg_action = ACTION_DISK_USAGE; break; + case ARG_VACUUM_SIZE: + r = parse_size(optarg, 1024, &arg_vacuum_size); + if (r < 0) { + log_error("Failed to parse vacuum size: %s", optarg); + return r; + } + + arg_action = ACTION_VACUUM; + break; + + case ARG_VACUUM_TIME: + r = parse_sec(optarg, &arg_vacuum_time); + if (r < 0) { + log_error("Failed to parse vacuum time: %s", optarg); + return r; + } + + arg_action = ACTION_VACUUM; + break; + #ifdef HAVE_GCRYPT case ARG_FORCE: arg_force = true; @@ -529,6 +654,12 @@ static int parse_argv(int argc, char *argv[]) { arg_until_set = true; break; + case 't': + r = strv_extend(&arg_syslog_identifier, optarg); + if (r < 0) + return log_oom(); + break; + case 'u': r = strv_extend(&arg_system_units, optarg); if (r < 0) @@ -565,19 +696,26 @@ static int parse_argv(int argc, char *argv[]) { arg_reverse = true; break; + case ARG_UTC: + arg_utc = true; + break; + + case ARG_FLUSH: + arg_action = ACTION_FLUSH; + break; + case '?': return -EINVAL; default: assert_not_reached("Unhandled option"); } - } - if (arg_follow && !arg_no_tail && arg_lines < 0) + if (arg_follow && !arg_no_tail && !arg_since && arg_lines == ARG_LINES_DEFAULT) arg_lines = 10; - if (arg_directory && arg_file) { - log_error("Please specify either -D/--directory= or --file=, not both."); + if (!!arg_directory + !!arg_file + !!arg_machine > 1) { + log_error("Please specify either -D/--directory= or --file= or -M/--machine=, not more than one."); return -EINVAL; } @@ -596,6 +734,11 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; } + if (arg_action != ACTION_SHOW && optind < argc) { + log_error("Extraneous arguments starting with '%s'", argv[optind]); + return -EINVAL; + } + return 1; } @@ -605,10 +748,8 @@ static int generate_new_id128(void) { unsigned i; r = sd_id128_randomize(&id); - if (r < 0) { - log_error("Failed to generate ID: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to generate ID: %m"); printf("As string:\n" SD_ID128_FORMAT_STR "\n\n" @@ -632,15 +773,20 @@ static int generate_new_id128(void) { static int add_matches(sd_journal *j, char **args) { char **i; + bool have_term = false; assert(j); STRV_FOREACH(i, args) { int r; - if (streq(*i, "+")) + if (streq(*i, "+")) { + if (!have_term) + break; r = sd_journal_add_disjunction(j); - else if (path_is_absolute(*i)) { + have_term = false; + + } else if (path_is_absolute(*i)) { _cleanup_free_ char *p, *t = NULL, *t2 = NULL; const char *path; _cleanup_free_ char *interpreter = NULL; @@ -649,23 +795,21 @@ static int add_matches(sd_journal *j, char **args) { p = canonicalize_file_name(*i); path = p ? p : *i; - if (stat(path, &st) < 0) { - log_error("Couldn't stat file: %m"); - return -errno; - } + if (stat(path, &st) < 0) + return log_error_errno(errno, "Couldn't stat file: %m"); if (S_ISREG(st.st_mode) && (0111 & st.st_mode)) { if (executable_is_script(path, &interpreter) > 0) { _cleanup_free_ char *comm; - comm = strndup(path_get_file_name(path), 15); + comm = strndup(basename(path), 15); if (!comm) return log_oom(); t = strappend("_COMM=", comm); /* Append _EXE only if the interpreter is not a link. - Otherwise it might be outdated often. */ + Otherwise, it might be outdated often. */ if (lstat(interpreter, &st) == 0 && !S_ISLNK(st.st_mode)) { t2 = strappend("_EXE=", interpreter); @@ -674,11 +818,17 @@ static int add_matches(sd_journal *j, char **args) { } } else t = strappend("_EXE=", path); - } else if (S_ISCHR(st.st_mode)) - asprintf(&t, "_KERNEL_DEVICE=c%u:%u", major(st.st_rdev), minor(st.st_rdev)); - else if (S_ISBLK(st.st_mode)) - asprintf(&t, "_KERNEL_DEVICE=b%u:%u", major(st.st_rdev), minor(st.st_rdev)); - else { + } else if (S_ISCHR(st.st_mode)) { + if (asprintf(&t, "_KERNEL_DEVICE=c%u:%u", + major(st.st_rdev), + minor(st.st_rdev)) < 0) + return -ENOMEM; + } else if (S_ISBLK(st.st_mode)) { + if (asprintf(&t, "_KERNEL_DEVICE=b%u:%u", + major(st.st_rdev), + minor(st.st_rdev)) < 0) + return -ENOMEM; + } else { log_error("File is neither a device node, nor regular file, nor executable: %s", *i); return -EINVAL; } @@ -689,13 +839,20 @@ static int add_matches(sd_journal *j, char **args) { r = sd_journal_add_match(j, t, 0); if (t2) r = sd_journal_add_match(j, t2, 0); - } else - r = sd_journal_add_match(j, *i, 0); + have_term = true; - if (r < 0) { - log_error("Failed to add match '%s': %s", *i, strerror(-r)); - return r; + } else { + r = sd_journal_add_match(j, *i, 0); + have_term = true; } + + if (r < 0) + return log_error_errno(r, "Failed to add match '%s': %m", *i); + } + + if (!strv_isempty(args) && !have_term) { + log_error("\"+\" can only be used between terms"); + return -EINVAL; } return 0; @@ -710,27 +867,32 @@ static int boot_id_cmp(const void *a, const void *b) { return _a < _b ? -1 : (_a > _b ? 1 : 0); } -static int list_boots(sd_journal *j) { +static int get_boots(sd_journal *j, + boot_id_t **boots, + unsigned int *count, + boot_id_t *query_ref_boot) { int r; const void *data; - unsigned int count = 0; - int w, i; size_t length, allocated = 0; - boot_id_t *id; - _cleanup_free_ boot_id_t *all_ids = NULL; + + assert(j); + assert(boots); + assert(count); r = sd_journal_query_unique(j, "_BOOT_ID"); if (r < 0) return r; + *count = 0; SD_JOURNAL_FOREACH_UNIQUE(j, data, length) { - if (length < strlen("_BOOT_ID=")) - continue; + boot_id_t *id; + + assert(startswith(data, "_BOOT_ID=")); - if (!GREEDY_REALLOC(all_ids, allocated, count + 1)) + if (!GREEDY_REALLOC(*boots, allocated, *count + 1)) return log_oom(); - id = &all_ids[count]; + id = *boots + *count; r = sd_id128_from_string(((const char *)data) + strlen("_BOOT_ID="), &id->id); if (r < 0) @@ -754,26 +916,48 @@ static int list_boots(sd_journal *j) { if (r < 0) return r; - r = sd_journal_seek_tail(j); - if (r < 0) - return r; + if (query_ref_boot) { + id->last = 0; + if (sd_id128_equal(id->id, query_ref_boot->id)) + *query_ref_boot = *id; + } else { + r = sd_journal_seek_tail(j); + if (r < 0) + return r; - r = sd_journal_previous(j); - if (r < 0) - return r; - else if (r == 0) - goto flush; + r = sd_journal_previous(j); + if (r < 0) + return r; + else if (r == 0) + goto flush; - r = sd_journal_get_realtime_usec(j, &id->last); - if (r < 0) - return r; + r = sd_journal_get_realtime_usec(j, &id->last); + if (r < 0) + return r; + } - count++; + (*count)++; flush: sd_journal_flush_matches(j); } - qsort_safe(all_ids, count, sizeof(boot_id_t), boot_id_cmp); + qsort_safe(*boots, *count, sizeof(boot_id_t), boot_id_cmp); + return 0; +} + +static int list_boots(sd_journal *j) { + int r, w, i; + unsigned int count; + boot_id_t *id; + _cleanup_free_ boot_id_t *all_ids = NULL; + + assert(j); + + r = get_boots(j, &all_ids, &count, NULL); + if (r < 0) + return r; + + pager_open_if_enabled(); /* numbers are one less, but we need an extra char for the sign */ w = DECIMAL_STR_WIDTH(count - 1) + 1; @@ -784,86 +968,41 @@ static int list_boots(sd_journal *j) { printf("% *i " SD_ID128_FORMAT_STR " %s—%s\n", w, i - count + 1, SD_ID128_FORMAT_VAL(id->id), - format_timestamp(a, sizeof(a), id->first), - format_timestamp(b, sizeof(b), id->last)); + format_timestamp_maybe_utc(a, sizeof(a), id->first), + format_timestamp_maybe_utc(b, sizeof(b), id->last)); } return 0; } -static int get_relative_boot_id(sd_journal *j, sd_id128_t *boot_id, int relative) { +static int get_boot_id_by_offset(sd_journal *j, sd_id128_t *boot_id, int offset) { int r; - const void *data; - unsigned int count = 0; - size_t length, allocated = 0; - boot_id_t ref_boot_id = {SD_ID128_NULL}, *id; + unsigned int count; + boot_id_t ref_boot_id = {}, *id; _cleanup_free_ boot_id_t *all_ids = NULL; assert(j); assert(boot_id); - if (relative == 0 && !sd_id128_equal(*boot_id, SD_ID128_NULL)) - return 0; - - r = sd_journal_query_unique(j, "_BOOT_ID"); + ref_boot_id.id = *boot_id; + r = get_boots(j, &all_ids, &count, &ref_boot_id); if (r < 0) return r; - SD_JOURNAL_FOREACH_UNIQUE(j, data, length) { - if (length < strlen("_BOOT_ID=")) - continue; - - if (!GREEDY_REALLOC(all_ids, allocated, count + 1)) - return log_oom(); - - id = &all_ids[count]; - - r = sd_id128_from_string(((const char *)data) + strlen("_BOOT_ID="), &id->id); - if (r < 0) - continue; - - r = sd_journal_add_match(j, data, length); - if (r < 0) - return r; - - r = sd_journal_seek_head(j); - if (r < 0) - return r; - - r = sd_journal_next(j); - if (r < 0) - return r; - else if (r == 0) - goto flush; - - r = sd_journal_get_realtime_usec(j, &id->first); - if (r < 0) - return r; - - if (sd_id128_equal(id->id, *boot_id)) - ref_boot_id = *id; - - count++; - flush: - sd_journal_flush_matches(j); - } - - qsort_safe(all_ids, count, sizeof(boot_id_t), boot_id_cmp); - if (sd_id128_equal(*boot_id, SD_ID128_NULL)) { - if (relative > (int) count || relative <= -(int)count) + if (offset > (int) count || offset <= -(int)count) return -EADDRNOTAVAIL; - *boot_id = all_ids[(relative <= 0)*count + relative - 1].id; + *boot_id = all_ids[(offset <= 0)*count + offset - 1].id; } else { id = bsearch(&ref_boot_id, all_ids, count, sizeof(boot_id_t), boot_id_cmp); if (!id || - relative <= 0 ? (id - all_ids) + relative < 0 : - (id - all_ids) + relative >= (int) count) + offset <= 0 ? (id - all_ids) + offset < 0 : + (id - all_ids) + offset >= (int) count) return -EADDRNOTAVAIL; - *boot_id = (id + relative)->id; + *boot_id = (id + offset)->id; } return 0; @@ -871,64 +1010,31 @@ static int get_relative_boot_id(sd_journal *j, sd_id128_t *boot_id, int relative static int add_boot(sd_journal *j) { char match[9+32+1] = "_BOOT_ID="; - char *offset; - sd_id128_t boot_id = SD_ID128_NULL; - int r, relative = 0; + int r; assert(j); if (!arg_boot) return 0; - if (!arg_boot_descriptor) - return add_match_this_boot(j); + if (arg_boot_offset == 0 && sd_id128_equal(arg_boot_id, SD_ID128_NULL)) + return add_match_this_boot(j, arg_machine); - if (strlen(arg_boot_descriptor) >= 32) { - char tmp = arg_boot_descriptor[32]; - arg_boot_descriptor[32] = '\0'; - r = sd_id128_from_string(arg_boot_descriptor, &boot_id); - arg_boot_descriptor[32] = tmp; - - if (r < 0) { - log_error("Failed to parse boot ID '%.32s': %s", - arg_boot_descriptor, strerror(-r)); - return r; - } - - offset = arg_boot_descriptor + 32; - - if (*offset && *offset != '-' && *offset != '+') { - log_error("Relative boot ID offset must start with a '+' or a '-', found '%s' ", offset); - return -EINVAL; - } - } else - offset = arg_boot_descriptor; - - if (*offset) { - r = safe_atoi(offset, &relative); - if (r < 0) { - log_error("Failed to parse relative boot ID number '%s'", offset); - return -EINVAL; - } - } - - r = get_relative_boot_id(j, &boot_id, relative); + r = get_boot_id_by_offset(j, &arg_boot_id, arg_boot_offset); if (r < 0) { - if (sd_id128_equal(boot_id, SD_ID128_NULL)) - log_error("Failed to look up boot %+d: %s", relative, strerror(-r)); + if (sd_id128_equal(arg_boot_id, SD_ID128_NULL)) + log_error_errno(r, "Failed to look up boot %+i: %m", arg_boot_offset); else - log_error("Failed to look up boot ID "SD_ID128_FORMAT_STR"%+d: %s", - SD_ID128_FORMAT_VAL(boot_id), relative, strerror(-r)); + log_error("Failed to look up boot ID "SD_ID128_FORMAT_STR"%+i: %s", + SD_ID128_FORMAT_VAL(arg_boot_id), arg_boot_offset, strerror(-r)); return r; } - sd_id128_to_string(boot_id, match + 9); + sd_id128_to_string(arg_boot_id, match + 9); r = sd_journal_add_match(j, match, sizeof(match) - 1); - if (r < 0) { - log_error("Failed to add match: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add match: %m"); r = sd_journal_add_conjunction(j); if (r < 0) @@ -945,10 +1051,8 @@ static int add_dmesg(sd_journal *j) { return 0; r = sd_journal_add_match(j, "_TRANSPORT=kernel", strlen("_TRANSPORT=kernel")); - if (r < 0) { - log_error("Failed to add match: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add match: %m"); r = sd_journal_add_conjunction(j); if (r < 0) @@ -957,40 +1061,177 @@ static int add_dmesg(sd_journal *j) { return 0; } -static int add_units(sd_journal *j) { - _cleanup_free_ char *u = NULL; +static int get_possible_units(sd_journal *j, + const char *fields, + char **patterns, + Set **units) { + _cleanup_set_free_free_ Set *found; + const char *field; int r; + + found = set_new(&string_hash_ops); + if (!found) + return log_oom(); + + NULSTR_FOREACH(field, fields) { + const void *data; + size_t size; + + r = sd_journal_query_unique(j, field); + if (r < 0) + return r; + + SD_JOURNAL_FOREACH_UNIQUE(j, data, size) { + char **pattern, *eq; + size_t prefix; + _cleanup_free_ char *u = NULL; + + eq = memchr(data, '=', size); + if (eq) + prefix = eq - (char*) data + 1; + else + prefix = 0; + + u = strndup((char*) data + prefix, size - prefix); + if (!u) + return log_oom(); + + STRV_FOREACH(pattern, patterns) + if (fnmatch(*pattern, u, FNM_NOESCAPE) == 0) { + log_debug("Matched %s with pattern %s=%s", u, field, *pattern); + + r = set_consume(found, u); + u = NULL; + if (r < 0 && r != -EEXIST) + return r; + + break; + } + } + } + + *units = found; + found = NULL; + return 0; +} + +/* This list is supposed to return the superset of unit names + * possibly matched by rules added with add_matches_for_unit... */ +#define SYSTEM_UNITS \ + "_SYSTEMD_UNIT\0" \ + "COREDUMP_UNIT\0" \ + "UNIT\0" \ + "OBJECT_SYSTEMD_UNIT\0" \ + "_SYSTEMD_SLICE\0" + +/* ... and add_matches_for_user_unit */ +#define USER_UNITS \ + "_SYSTEMD_USER_UNIT\0" \ + "USER_UNIT\0" \ + "COREDUMP_USER_UNIT\0" \ + "OBJECT_SYSTEMD_USER_UNIT\0" + +static int add_units(sd_journal *j) { + _cleanup_strv_free_ char **patterns = NULL; + int r, count = 0; char **i; assert(j); STRV_FOREACH(i, arg_system_units) { - u = unit_name_mangle(*i); + _cleanup_free_ char *u = NULL; + + u = unit_name_mangle(*i, MANGLE_GLOB); if (!u) return log_oom(); - r = add_matches_for_unit(j, u); - if (r < 0) - return r; - r = sd_journal_add_disjunction(j); + + if (string_is_glob(u)) { + r = strv_push(&patterns, u); + if (r < 0) + return r; + u = NULL; + } else { + r = add_matches_for_unit(j, u); + if (r < 0) + return r; + r = sd_journal_add_disjunction(j); + if (r < 0) + return r; + count ++; + } + } + + if (!strv_isempty(patterns)) { + _cleanup_set_free_free_ Set *units = NULL; + Iterator it; + char *u; + + r = get_possible_units(j, SYSTEM_UNITS, patterns, &units); if (r < 0) return r; + + SET_FOREACH(u, units, it) { + r = add_matches_for_unit(j, u); + if (r < 0) + return r; + r = sd_journal_add_disjunction(j); + if (r < 0) + return r; + count ++; + } } + strv_free(patterns); + patterns = NULL; + STRV_FOREACH(i, arg_user_units) { - u = unit_name_mangle(*i); + _cleanup_free_ char *u = NULL; + + u = unit_name_mangle(*i, MANGLE_GLOB); if (!u) return log_oom(); - r = add_matches_for_user_unit(j, u, getuid()); - if (r < 0) - return r; + if (string_is_glob(u)) { + r = strv_push(&patterns, u); + if (r < 0) + return r; + u = NULL; + } else { + r = add_matches_for_user_unit(j, u, getuid()); + if (r < 0) + return r; + r = sd_journal_add_disjunction(j); + if (r < 0) + return r; + count ++; + } + } - r = sd_journal_add_disjunction(j); + if (!strv_isempty(patterns)) { + _cleanup_set_free_free_ Set *units = NULL; + Iterator it; + char *u; + + r = get_possible_units(j, USER_UNITS, patterns, &units); if (r < 0) return r; + SET_FOREACH(u, units, it) { + r = add_matches_for_user_unit(j, u, getuid()); + if (r < 0) + return r; + r = sd_journal_add_disjunction(j); + if (r < 0) + return r; + count ++; + } } + /* Complain if the user request matches but nothing whatsoever was + * found, since otherwise everything would be matched. */ + if (!(strv_isempty(arg_system_units) && strv_isempty(arg_user_units)) && count == 0) + return -ENODATA; + r = sd_journal_add_conjunction(j); if (r < 0) return r; @@ -1011,10 +1252,8 @@ static int add_priorities(sd_journal *j) { match[sizeof(match)-2] = '0' + i; r = sd_journal_add_match(j, match, strlen(match)); - if (r < 0) { - log_error("Failed to add match: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add match: %m"); } r = sd_journal_add_conjunction(j); @@ -1024,12 +1263,38 @@ static int add_priorities(sd_journal *j) { return 0; } + +static int add_syslog_identifier(sd_journal *j) { + int r; + char **i; + + assert(j); + + STRV_FOREACH(i, arg_syslog_identifier) { + char *u; + + u = strappenda("SYSLOG_IDENTIFIER=", *i); + r = sd_journal_add_match(j, u, 0); + if (r < 0) + return r; + r = sd_journal_add_disjunction(j); + if (r < 0) + return r; + } + + r = sd_journal_add_conjunction(j); + if (r < 0) + return r; + + return 0; +} + static int setup_keys(void) { #ifdef HAVE_GCRYPT size_t mpk_size, seed_size, state_size, i; uint8_t *mpk, *seed, *state; ssize_t l; - int fd = -1, r, attr = 0; + int fd = -1, r; sd_id128_t machine, boot; char *p = NULL, *k = NULL; struct FSSHeader h; @@ -1037,10 +1302,8 @@ static int setup_keys(void) { struct stat st; r = stat("/var/log/journal", &st); - if (r < 0 && errno != ENOENT && errno != ENOTDIR) { - log_error("stat(\"%s\") failed: %m", "/var/log/journal"); - return -errno; - } + if (r < 0 && errno != ENOENT && errno != ENOTDIR) + return log_error_errno(errno, "stat(\"%s\") failed: %m", "/var/log/journal"); if (r < 0 || !S_ISDIR(st.st_mode)) { log_error("%s is not a directory, must be using persistent logging for FSS.", @@ -1049,16 +1312,12 @@ static int setup_keys(void) { } r = sd_id128_get_machine(&machine); - if (r < 0) { - log_error("Failed to get machine ID: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to get machine ID: %m"); r = sd_id128_get_boot(&boot); - if (r < 0) { - log_error("Failed to get boot ID: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to get boot ID: %m"); if (asprintf(&p, "/var/log/journal/" SD_ID128_FORMAT_STR "/fss", SD_ID128_FORMAT_VAL(machine)) < 0) @@ -1068,7 +1327,7 @@ static int setup_keys(void) { if (arg_force) { r = unlink(p); if (r < 0) { - log_error("unlink(\"%s\") failed: %m", p); + log_error_errno(errno, "unlink(\"%s\") failed: %m", p); r = -errno; goto finish; } @@ -1096,7 +1355,7 @@ static int setup_keys(void) { fd = open("/dev/random", O_RDONLY|O_CLOEXEC|O_NOCTTY); if (fd < 0) { - log_error("Failed to open /dev/random: %m"); + log_error_errno(errno, "Failed to open /dev/random: %m"); r = -errno; goto finish; } @@ -1104,7 +1363,7 @@ static int setup_keys(void) { log_info("Generating seed..."); l = loop_read(fd, seed, seed_size, true); if (l < 0 || (size_t) l != seed_size) { - log_error("Failed to read random seed: %s", strerror(EIO)); + log_error_errno(EIO, "Failed to read random seed: %m"); r = -EIO; goto finish; } @@ -1120,23 +1379,19 @@ static int setup_keys(void) { n = now(CLOCK_REALTIME); n /= arg_interval; - close_nointr_nofail(fd); - fd = mkostemp(k, O_WRONLY|O_CLOEXEC|O_NOCTTY); + safe_close(fd); + fd = mkostemp_safe(k, O_WRONLY|O_CLOEXEC); if (fd < 0) { - log_error("Failed to open %s: %m", k); + log_error_errno(errno, "Failed to open %s: %m", k); r = -errno; goto finish; } /* Enable secure remove, exclusion from dump, synchronous * writing and in-place updating */ - if (ioctl(fd, FS_IOC_GETFLAGS, &attr) < 0) - log_warning("FS_IOC_GETFLAGS failed: %m"); - - attr |= FS_SECRM_FL|FS_NODUMP_FL|FS_SYNC_FL|FS_NOCOW_FL; - - if (ioctl(fd, FS_IOC_SETFLAGS, &attr) < 0) - log_warning("FS_IOC_SETFLAGS failed: %m"); + r = chattr_fd(fd, true, FS_SECRM_FL|FS_NODUMP_FL|FS_SYNC_FL|FS_NOCOW_FL); + if (r < 0) + log_warning_errno(errno, "Failed to set file attributes: %m"); zero(h); memcpy(h.signature, "KSHHRHLP", 8); @@ -1148,22 +1403,20 @@ static int setup_keys(void) { h.fsprg_secpar = htole16(FSPRG_RECOMMENDED_SECPAR); h.fsprg_state_size = htole64(state_size); - l = loop_write(fd, &h, sizeof(h), false); - if (l < 0 || (size_t) l != sizeof(h)) { - log_error("Failed to write header: %s", strerror(EIO)); - r = -EIO; + r = loop_write(fd, &h, sizeof(h), false); + if (r < 0) { + log_error_errno(r, "Failed to write header: %m"); goto finish; } - l = loop_write(fd, state, state_size, false); - if (l < 0 || (size_t) l != state_size) { - log_error("Failed to write state: %s", strerror(EIO)); - r = -EIO; + r = loop_write(fd, state, state_size, false); + if (r < 0) { + log_error_errno(r, "Failed to write state: %m"); goto finish; } if (link(k, p) < 0) { - log_error("Failed to link file: %m"); + log_error_errno(errno, "Failed to link file: %m"); r = -errno; goto finish; } @@ -1219,8 +1472,7 @@ static int setup_keys(void) { r = 0; finish: - if (fd >= 0) - close_nointr_nofail(fd); + safe_close(fd); if (k) { unlink(k); @@ -1245,7 +1497,7 @@ static int verify(sd_journal *j) { log_show_color(true); - HASHMAP_FOREACH(f, j->files, i) { + ORDERED_HASHMAP_FOREACH(f, j->files, i) { int k; usec_t first, validated, last; @@ -1268,8 +1520,8 @@ static int verify(sd_journal *j) { if (arg_verify_key && JOURNAL_HEADER_SEALED(f->header)) { if (validated > 0) { log_info("=> Validated from %s to %s, final %s entries not sealed.", - format_timestamp(a, sizeof(a), first), - format_timestamp(b, sizeof(b), validated), + format_timestamp_maybe_utc(a, sizeof(a), first), + format_timestamp_maybe_utc(b, sizeof(b), validated), format_timespan(c, sizeof(c), last > validated ? last - validated : 0, 0)); } else if (last > 0) log_info("=> No sealing yet, %s of entries not sealed.", @@ -1340,7 +1592,7 @@ static int access_check(sd_journal *j) { assert(j); if (set_isempty(j->errors)) { - if (hashmap_isempty(j->files)) + if (ordered_hashmap_isempty(j->files)) log_notice("No journal files were found."); return 0; } @@ -1372,7 +1624,7 @@ static int access_check(sd_journal *j) { } #endif - if (hashmap_isempty(j->files)) { + if (ordered_hashmap_isempty(j->files)) { log_error("No journal files were opened due to insufficient permissions."); r = -EACCES; } @@ -1385,13 +1637,71 @@ static int access_check(sd_journal *j) { assert(err > 0); if (err != EACCES) - log_warning("Error was encountered while opening journal files: %s", - strerror(err)); + log_warning_errno(err, "Error was encountered while opening journal files: %m"); } return r; } +static int flush_to_var(void) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; + _cleanup_close_ int watch_fd = -1; + int r; + + /* Quick exit */ + if (access("/run/systemd/journal/flushed", F_OK) >= 0) + return 0; + + /* OK, let's actually do the full logic, send SIGUSR1 to the + * daemon and set up inotify to wait for the flushed file to appear */ + r = bus_open_system_systemd(&bus); + if (r < 0) + return log_error_errno(r, "Failed to get D-Bus connection: %m"); + + r = sd_bus_call_method( + bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "KillUnit", + &error, + NULL, + "ssi", "systemd-journald.service", "main", SIGUSR1); + if (r < 0) { + log_error("Failed to kill journal service: %s", bus_error_message(&error, r)); + return r; + } + + mkdir_p("/run/systemd/journal", 0755); + + watch_fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC); + if (watch_fd < 0) + return log_error_errno(errno, "Failed to create inotify watch: %m"); + + r = inotify_add_watch(watch_fd, "/run/systemd/journal", IN_CREATE|IN_DONT_FOLLOW|IN_ONLYDIR); + if (r < 0) + return log_error_errno(errno, "Failed to watch journal directory: %m"); + + for (;;) { + if (access("/run/systemd/journal/flushed", F_OK) >= 0) + break; + + if (errno != ENOENT) + return log_error_errno(errno, "Failed to check for existence of /run/systemd/journal/flushed: %m"); + + r = fd_wait_for_event(watch_fd, POLLIN, USEC_INFINITY); + if (r < 0) + return log_error_errno(r, "Failed to wait for event: %m"); + + r = flush_fd(watch_fd); + if (r < 0) + return log_error_errno(r, "Failed to flush inotify events: %m"); + } + + return 0; +} + int main(int argc, char *argv[]) { int r; _cleanup_journal_close_ sd_journal *j = NULL; @@ -1410,12 +1720,18 @@ int main(int argc, char *argv[]) { goto finish; signal(SIGWINCH, columns_lines_cache_reset); + sigbus_install(); if (arg_action == ACTION_NEW_ID128) { r = generate_new_id128(); goto finish; } + if (arg_action == ACTION_FLUSH) { + r = flush_to_var(); + goto finish; + } + if (arg_action == ACTION_SETUP_KEYS) { r = setup_keys(); goto finish; @@ -1425,22 +1741,18 @@ int main(int argc, char *argv[]) { arg_action == ACTION_LIST_CATALOG || arg_action == ACTION_DUMP_CATALOG) { - const char* database = CATALOG_DATABASE; - _cleanup_free_ char *copy = NULL; - if (arg_root) { - copy = strjoin(arg_root, "/", CATALOG_DATABASE, NULL); - if (!copy) { - r = log_oom(); - goto finish; - } - path_kill_slashes(copy); - database = copy; + _cleanup_free_ char *database; + + database = path_join(arg_root, CATALOG_DATABASE, NULL); + if (!database) { + r = log_oom(); + goto finish; } if (arg_action == ACTION_UPDATE_CATALOG) { r = catalog_update(database, arg_root, catalog_file_dirs); if (r < 0) - log_error("Failed to list catalog: %s", strerror(-r)); + log_error_errno(r, "Failed to list catalog: %m"); } else { bool oneline = arg_action == ACTION_LIST_CATALOG; @@ -1450,7 +1762,7 @@ int main(int argc, char *argv[]) { else r = catalog_list(stdout, database, oneline); if (r < 0) - log_error("Failed to list catalog: %s", strerror(-r)); + log_error_errno(r, "Failed to list catalog: %m"); } goto finish; @@ -1460,12 +1772,13 @@ int main(int argc, char *argv[]) { r = sd_journal_open_directory(&j, arg_directory, arg_journal_type); else if (arg_file) r = sd_journal_open_files(&j, (const char**) arg_file, 0); + else if (arg_machine) + r = sd_journal_open_container(&j, arg_machine, 0); else r = sd_journal_open(&j, !arg_merge*SD_JOURNAL_LOCAL_ONLY + arg_journal_type); if (r < 0) { - log_error("Failed to open %s: %s", - arg_directory ? arg_directory : arg_file ? "files" : "journal", - strerror(-r)); + log_error_errno(r, "Failed to open %s: %m", + arg_directory ? arg_directory : arg_file ? "files" : "journal"); return EXIT_FAILURE; } @@ -1484,18 +1797,38 @@ int main(int argc, char *argv[]) { } if (arg_action == ACTION_DISK_USAGE) { - uint64_t bytes; + uint64_t bytes = 0; char sbytes[FORMAT_BYTES_MAX]; r = sd_journal_get_usage(j, &bytes); if (r < 0) return EXIT_FAILURE; - printf("Journals take up %s on disk.\n", + printf("Archived and active journals take up %s on disk.\n", format_bytes(sbytes, sizeof(sbytes), bytes)); return EXIT_SUCCESS; } + if (arg_action == ACTION_VACUUM) { + Directory *d; + Iterator i; + + HASHMAP_FOREACH(d, j->directories_by_path, i) { + int q; + + if (d->is_root) + continue; + + q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_time, NULL, true); + if (q < 0) { + log_error_errno(q, "Failed to vacuum: %m"); + r = q; + } + } + + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + } + if (arg_action == ACTION_LIST_BOOTS) { r = list_boots(j); goto finish; @@ -1515,18 +1848,30 @@ int main(int argc, char *argv[]) { strv_free(arg_system_units); strv_free(arg_user_units); - if (r < 0) + if (r < 0) { + log_error_errno(r, "Failed to add filter for units: %m"); return EXIT_FAILURE; + } + + r = add_syslog_identifier(j); + if (r < 0) { + log_error_errno(r, "Failed to add filter for syslog identifiers: %m"); + return EXIT_FAILURE; + } r = add_priorities(j); - if (r < 0) + if (r < 0) { + log_error_errno(r, "Failed to add filter for priorities: %m"); return EXIT_FAILURE; + } r = add_matches(j, argv + optind); - if (r < 0) + if (r < 0) { + log_error_errno(r, "Failed to add filters: %m"); return EXIT_FAILURE; + } - if (_unlikely_(log_get_max_level() >= LOG_PRI(LOG_DEBUG))) { + if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) { _cleanup_free_ char *filter; filter = journal_make_match_string(j); @@ -1545,7 +1890,7 @@ int main(int argc, char *argv[]) { r = sd_journal_query_unique(j, arg_field); if (r < 0) { - log_error("Failed to query unique data objects: %s", strerror(-r)); + log_error_errno(r, "Failed to query unique data objects: %m"); return EXIT_FAILURE; } @@ -1575,9 +1920,9 @@ int main(int argc, char *argv[]) { } if (arg_cursor || arg_after_cursor) { - r = sd_journal_seek_cursor(j, arg_cursor ? arg_cursor : arg_after_cursor); + r = sd_journal_seek_cursor(j, arg_cursor ?: arg_after_cursor); if (r < 0) { - log_error("Failed to seek to cursor: %s", strerror(-r)); + log_error_errno(r, "Failed to seek to cursor: %m"); return EXIT_FAILURE; } if (!arg_reverse) @@ -1585,14 +1930,18 @@ int main(int argc, char *argv[]) { else r = sd_journal_previous_skip(j, 1 + !!arg_after_cursor); - if (arg_after_cursor && r < 2 && !arg_follow) + if (arg_after_cursor && r < 2) { /* We couldn't find the next entry after the cursor. */ - arg_lines = 0; + if (arg_follow) + need_seek = true; + else + arg_lines = 0; + } } else if (arg_since_set && !arg_reverse) { r = sd_journal_seek_realtime_usec(j, arg_since); if (r < 0) { - log_error("Failed to seek to date: %s", strerror(-r)); + log_error_errno(r, "Failed to seek to date: %m"); return EXIT_FAILURE; } r = sd_journal_next(j); @@ -1600,7 +1949,7 @@ int main(int argc, char *argv[]) { } else if (arg_until_set && arg_reverse) { r = sd_journal_seek_realtime_usec(j, arg_until); if (r < 0) { - log_error("Failed to seek to date: %s", strerror(-r)); + log_error_errno(r, "Failed to seek to date: %m"); return EXIT_FAILURE; } r = sd_journal_previous(j); @@ -1608,7 +1957,7 @@ int main(int argc, char *argv[]) { } else if (arg_lines >= 0) { r = sd_journal_seek_tail(j); if (r < 0) { - log_error("Failed to seek to tail: %s", strerror(-r)); + log_error_errno(r, "Failed to seek to tail: %m"); return EXIT_FAILURE; } @@ -1617,7 +1966,7 @@ int main(int argc, char *argv[]) { } else if (arg_reverse) { r = sd_journal_seek_tail(j); if (r < 0) { - log_error("Failed to seek to tail: %s", strerror(-r)); + log_error_errno(r, "Failed to seek to tail: %m"); return EXIT_FAILURE; } @@ -1626,7 +1975,7 @@ int main(int argc, char *argv[]) { } else { r = sd_journal_seek_head(j); if (r < 0) { - log_error("Failed to seek to head: %s", strerror(-r)); + log_error_errno(r, "Failed to seek to head: %m"); return EXIT_FAILURE; } @@ -1634,12 +1983,12 @@ int main(int argc, char *argv[]) { } if (r < 0) { - log_error("Failed to iterate through journal: %s", strerror(-r)); + log_error_errno(r, "Failed to iterate through journal: %m"); return EXIT_FAILURE; } - if (!arg_no_pager && !arg_follow) - pager_open(arg_pager_end); + if (!arg_follow) + pager_open_if_enabled(); if (!arg_quiet) { usec_t start, end; @@ -1647,18 +1996,18 @@ int main(int argc, char *argv[]) { r = sd_journal_get_cutoff_realtime_usec(j, &start, &end); if (r < 0) { - log_error("Failed to get cutoff: %s", strerror(-r)); + log_error_errno(r, "Failed to get cutoff: %m"); goto finish; } if (r > 0) { if (arg_follow) printf("-- Logs begin at %s. --\n", - format_timestamp(start_buf, sizeof(start_buf), start)); + format_timestamp_maybe_utc(start_buf, sizeof(start_buf), start)); else printf("-- Logs begin at %s, end at %s. --\n", - format_timestamp(start_buf, sizeof(start_buf), start), - format_timestamp(end_buf, sizeof(end_buf), end)); + format_timestamp_maybe_utc(start_buf, sizeof(start_buf), start), + format_timestamp_maybe_utc(end_buf, sizeof(end_buf), end)); } } @@ -1672,7 +2021,7 @@ int main(int argc, char *argv[]) { else r = sd_journal_previous(j); if (r < 0) { - log_error("Failed to iterate through journal: %s", strerror(-r)); + log_error_errno(r, "Failed to iterate through journal: %m"); goto finish; } if (r == 0) @@ -1684,7 +2033,7 @@ int main(int argc, char *argv[]) { r = sd_journal_get_realtime_usec(j, &usec); if (r < 0) { - log_error("Failed to determine timestamp: %s", strerror(-r)); + log_error_errno(r, "Failed to determine timestamp: %m"); goto finish; } if (usec > arg_until) @@ -1696,14 +2045,14 @@ int main(int argc, char *argv[]) { r = sd_journal_get_realtime_usec(j, &usec); if (r < 0) { - log_error("Failed to determine timestamp: %s", strerror(-r)); + log_error_errno(r, "Failed to determine timestamp: %m"); goto finish; } if (usec < arg_since) goto finish; } - if (!arg_merge) { + if (!arg_merge && !arg_quiet) { sd_id128_t boot_id; r = sd_journal_get_monotonic_usec(j, NULL, &boot_id); @@ -1722,7 +2071,8 @@ int main(int argc, char *argv[]) { arg_all * OUTPUT_SHOW_ALL | arg_full * OUTPUT_FULL_WIDTH | on_tty() * OUTPUT_COLOR | - arg_catalog * OUTPUT_CATALOG; + arg_catalog * OUTPUT_CATALOG | + arg_utc * OUTPUT_UTC; r = output_journal(stdout, j, arg_output, 0, flags, &ellipsized); need_seek = true; @@ -1740,7 +2090,7 @@ int main(int argc, char *argv[]) { r = sd_journal_get_cursor(j, &cursor); if (r < 0 && r != -EADDRNOTAVAIL) - log_error("Failed to get cursor: %s", strerror(-r)); + log_error_errno(r, "Failed to get cursor: %m"); else if (r >= 0) printf("-- cursor: %s\n", cursor); } @@ -1750,7 +2100,7 @@ int main(int argc, char *argv[]) { r = sd_journal_wait(j, (uint64_t) -1); if (r < 0) { - log_error("Couldn't wait for journal event: %s", strerror(-r)); + log_error_errno(r, "Couldn't wait for journal event: %m"); goto finish; } @@ -1760,5 +2110,7 @@ int main(int argc, char *argv[]) { finish: pager_close(); + strv_free(arg_file); + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }