X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=6077b6e1a2a8c5439c6f0942fa92270733805e01;hb=31938a8560a664c32a9d72f1fc2d4347b232e6e9;hp=7ce5ff6a66f0a2b1fb48915bce0254b6c3084bb3;hpb=ea7061e4d431c3e03212243f65148f2e985d80b7;p=elogind.git diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 7ce5ff6a6..6077b6e1a 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -59,6 +59,7 @@ #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" @@ -111,6 +112,8 @@ 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, @@ -124,6 +127,7 @@ static enum { ACTION_UPDATE_CATALOG, ACTION_LIST_BOOTS, ACTION_FLUSH, + ACTION_VACUUM, } arg_action = ACTION_SHOW; typedef struct boot_id_t { @@ -194,7 +198,7 @@ static void help(void) { " --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 older 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" @@ -231,14 +235,16 @@ static void help(void) { "\nCommands:\n" " -h --help Show this help text\n" " --version Show package version\n" + " -F --field=FIELD List all values that a specified field takes\n" " --new-id128 Generate a new 128-bit ID\n" - " --header Show journal header information\n" " --disk-usage Show total disk usage of all journal files\n" - " -F --field=FIELD List all values that a specified field takes\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" " --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" - " --flush Flush all journal data from /run into /var\n" #ifdef HAVE_GCRYPT " --setup-keys Generate a new FSS key pair\n" " --verify Verify journal file consistency\n" @@ -276,6 +282,8 @@ static int parse_argv(int argc, char *argv[]) { ARG_FORCE, ARG_UTC, ARG_FLUSH, + ARG_VACUUM_SIZE, + ARG_VACUUM_TIME, }; static const struct option options[] = { @@ -327,6 +335,8 @@ static int parse_argv(int argc, char *argv[]) { { "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 }, {} }; @@ -492,7 +502,7 @@ static int parse_argv(int argc, char *argv[]) { case ARG_FILE: r = glob_extend(&arg_file, optarg); if (r < 0) { - log_error("Failed to add paths: %s", strerror(-r)); + log_error_errno(r, "Failed to add paths: %m"); return r; }; break; @@ -525,6 +535,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; @@ -682,7 +712,7 @@ static int parse_argv(int argc, char *argv[]) { assert_not_reached("Unhandled option"); } - if (arg_follow && !arg_no_tail && arg_lines == ARG_LINES_DEFAULT) + if (arg_follow && !arg_no_tail && !arg_since && arg_lines == ARG_LINES_DEFAULT) arg_lines = 10; if (!!arg_directory + !!arg_file + !!arg_machine > 1) { @@ -720,7 +750,7 @@ static int generate_new_id128(void) { r = sd_id128_randomize(&id); if (r < 0) { - log_error("Failed to generate ID: %s", strerror(-r)); + log_error_errno(r, "Failed to generate ID: %m"); return r; } @@ -822,7 +852,7 @@ static int add_matches(sd_journal *j, char **args) { } if (r < 0) { - log_error("Failed to add match '%s': %s", *i, strerror(-r)); + log_error_errno(r, "Failed to add match '%s': %m", *i); return r; } } @@ -1000,7 +1030,7 @@ static int add_boot(sd_journal *j) { r = get_boot_id_by_offset(j, &arg_boot_id, arg_boot_offset); if (r < 0) { if (sd_id128_equal(arg_boot_id, SD_ID128_NULL)) - log_error("Failed to look up boot %+i: %s", arg_boot_offset, strerror(-r)); + 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"%+i: %s", SD_ID128_FORMAT_VAL(arg_boot_id), arg_boot_offset, strerror(-r)); @@ -1011,7 +1041,7 @@ static int add_boot(sd_journal *j) { r = sd_journal_add_match(j, match, sizeof(match) - 1); if (r < 0) { - log_error("Failed to add match: %s", strerror(-r)); + log_error_errno(r, "Failed to add match: %m"); return r; } @@ -1031,7 +1061,7 @@ static int add_dmesg(sd_journal *j) { r = sd_journal_add_match(j, "_TRANSPORT=kernel", strlen("_TRANSPORT=kernel")); if (r < 0) { - log_error("Failed to add match: %s", strerror(-r)); + log_error_errno(r, "Failed to add match: %m"); return r; } @@ -1234,7 +1264,7 @@ static int add_priorities(sd_journal *j) { r = sd_journal_add_match(j, match, strlen(match)); if (r < 0) { - log_error("Failed to add match: %s", strerror(-r)); + log_error_errno(r, "Failed to add match: %m"); return r; } } @@ -1298,13 +1328,13 @@ static int setup_keys(void) { r = sd_id128_get_machine(&machine); if (r < 0) { - log_error("Failed to get machine ID: %s", strerror(-r)); + log_error_errno(r, "Failed to get machine ID: %m"); return r; } r = sd_id128_get_boot(&boot); if (r < 0) { - log_error("Failed to get boot ID: %s", strerror(-r)); + log_error_errno(r, "Failed to get boot ID: %m"); return r; } @@ -1653,7 +1683,7 @@ static int flush_to_var(void) { * daemon and set up inotify to wait for the flushed file to appear */ r = bus_open_system_systemd(&bus); if (r < 0) { - log_error("Failed to get D-Bus connection: %s", strerror(-r)); + log_error_errno(r, "Failed to get D-Bus connection: %m"); return r; } @@ -1696,13 +1726,13 @@ static int flush_to_var(void) { r = fd_wait_for_event(watch_fd, POLLIN, USEC_INFINITY); if (r < 0) { - log_error("Failed to wait for event: %s", strerror(-r)); + log_error_errno(r, "Failed to wait for event: %m"); return r; } r = flush_fd(watch_fd); if (r < 0) { - log_error("Failed to flush inotify events: %s", strerror(-r)); + log_error_errno(r, "Failed to flush inotify events: %m"); return r; } } @@ -1759,7 +1789,7 @@ int main(int argc, char *argv[]) { 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; @@ -1769,7 +1799,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; @@ -1812,11 +1842,31 @@ int main(int argc, char *argv[]) { 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; @@ -1837,25 +1887,25 @@ int main(int argc, char *argv[]) { strv_free(arg_user_units); if (r < 0) { - log_error("Failed to add filter for units: %s", strerror(-r)); + log_error_errno(r, "Failed to add filter for units: %m"); return EXIT_FAILURE; } r = add_syslog_identifier(j); if (r < 0) { - log_error("Failed to add filter for syslog identifiers: %s", strerror(-r)); + log_error_errno(r, "Failed to add filter for syslog identifiers: %m"); return EXIT_FAILURE; } r = add_priorities(j); if (r < 0) { - log_error("Failed to add filter for priorities: %s", strerror(-r)); + log_error_errno(r, "Failed to add filter for priorities: %m"); return EXIT_FAILURE; } r = add_matches(j, argv + optind); if (r < 0) { - log_error("Failed to add filters: %s", strerror(-r)); + log_error_errno(r, "Failed to add filters: %m"); return EXIT_FAILURE; } @@ -1878,7 +1928,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; } @@ -1910,7 +1960,7 @@ int main(int argc, char *argv[]) { if (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) @@ -1925,7 +1975,7 @@ int main(int argc, char *argv[]) { } 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); @@ -1933,7 +1983,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); @@ -1941,7 +1991,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; } @@ -1950,7 +2000,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; } @@ -1959,7 +2009,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; } @@ -1967,7 +2017,7 @@ 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; } @@ -1980,7 +2030,7 @@ 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; } @@ -2005,7 +2055,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) @@ -2017,7 +2067,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) @@ -2029,7 +2079,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_since) @@ -2074,7 +2124,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); } @@ -2084,7 +2134,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; }