Skip to content

Commit

Permalink
journalctl: implement --since= and --until for filtering by time
Browse files Browse the repository at this point in the history
  • Loading branch information
@poettering
poettering committed Oct 11, 2012
1 parent fb5d873 commit cfbc22a
Show file tree
Hide file tree
Showing 8 changed files with 380 additions and 41 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/test-date
/install-tree
/systemd-journal-gatewayd
/test-mmap-cache
Expand Down
12 changes: 10 additions & 2 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1157,14 +1157,16 @@ noinst_PROGRAMS += \
test-watchdog \
test-unit-name \
test-log \
test-unit-file
test-unit-file \
test-date

TESTS += \
test-job-type \
test-env-replace \
test-strv \
test-unit-name \
test-unit-file
test-unit-file \
test-data

test_engine_SOURCES = \
src/test/test-engine.c
Expand Down Expand Up @@ -1226,6 +1228,12 @@ test_log_SOURCES = \
test_log_LDADD = \
libsystemd-core.la

test_date_SOURCES = \
src/test/test-date.c

test_date_LDADD = \
libsystemd-core.la

test_daemon_SOURCES = \
src/test/test-daemon.c

Expand Down
2 changes: 2 additions & 0 deletions TODO
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ F18:

Features:

* _SOURCE_MONOTONIC_TIMESTAMP entries from the kernel seem to be off by 1000000

* document unit_name_mangle()

* add new command to systemctl: "systemctl system-reexec" which reexecs as many daemons as virtually possible
Expand Down
35 changes: 33 additions & 2 deletions man/journalctl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,42 @@
<term><option>--cursor=</option></term>
<term><option>-c</option></term>

<listitem><para>Jump to the location
in the journal specified by the passed
<listitem><para>Start showing entries
from the location in the journal
specified by the passed
cursor.</para></listitem>
</varlistentry>

<varlistentry>
<term><option>--since=</option></term>
<term><option>--until=</option></term>

<listitem><para>Start showing entries
newer or of the specified date,
resp. older or of the specified
date. Date specifications should be of
the format "2012-10-30 18:17:16". If
the time part is omitted, 00:00:00 is
assumed. If only the seconds component
is omitted, :00 is assumed. If the
date component is ommitted, the
current day is assumed. Alternatively
the strings
<literal>yesterday</literal>,
<literal>today</literal>,
<literal>tomorrow</literal> are
understood, which refer to 00:00:00 of
the day before the current day, the
current day, resp the day after the
current day. <literal>now</literal>
refers to the current time. Finally,
relative times may be specified,
prefixed with <literal>-</literal> or
<literal>+</literal>, referring to
times before resp. after the current
time.</para></listitem>
</varlistentry>

<varlistentry>
<term><option>--directory=</option></term>
<term><option>-D</option></term>
Expand Down
125 changes: 94 additions & 31 deletions src/journal/journalctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ 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 unsigned arg_lines = 0;
static bool arg_no_tail = false;
static bool arg_quiet = false;
static bool arg_merge = false;
Expand All @@ -70,6 +70,8 @@ static const char *arg_verify_key = NULL;
#ifdef HAVE_GCRYPT
static usec_t arg_interval = DEFAULT_FSS_INTERVAL_USEC;
#endif
static usec_t arg_since, arg_until;
static bool arg_since_set = false, arg_until_set = false;

static enum {
ACTION_SHOW,
Expand All @@ -88,7 +90,9 @@ static int help(void) {
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
" -a --all Show all fields, including long and unprintable\n"
" -c --cursor=CURSOR Jump to the specified cursor\n"
" -c --cursor=CURSOR Start showing entries from specified cursor\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"
" -f --follow Follow journal\n"
" -n --lines[=INTEGER] Number of journal entries to show\n"
" --no-tail Show all lines, even in follow mode\n"
Expand Down Expand Up @@ -126,7 +130,9 @@ static int parse_argv(int argc, char *argv[]) {
ARG_INTERVAL,
ARG_VERIFY,
ARG_VERIFY_KEY,
ARG_DISK_USAGE
ARG_DISK_USAGE,
ARG_SINCE,
ARG_UNTIL
};

static const struct option options[] = {
Expand All @@ -151,6 +157,8 @@ static int parse_argv(int argc, char *argv[]) {
{ "verify-key", required_argument, NULL, ARG_VERIFY_KEY },
{ "disk-usage", no_argument, NULL, ARG_DISK_USAGE },
{ "cursor", required_argument, NULL, 'c' },
{ "since", required_argument, NULL, ARG_SINCE },
{ "until", required_argument, NULL, ARG_UNTIL },
{ NULL, 0, NULL, 0 }
};

Expand Down Expand Up @@ -197,8 +205,8 @@ static int parse_argv(int argc, char *argv[]) {

case 'n':
if (optarg) {
r = safe_atoi(optarg, &arg_lines);
if (r < 0 || arg_lines < 0) {
r = safe_atou(optarg, &arg_lines);
if (r < 0 || arg_lines <= 0) {
log_error("Failed to parse lines '%s'", optarg);
return -EINVAL;
}
Expand Down Expand Up @@ -324,6 +332,24 @@ static int parse_argv(int argc, char *argv[]) {
break;
}

case ARG_SINCE:
r = parse_timestamp(optarg, &arg_since);
if (r < 0) {
log_error("Failed to parse timestamp: %s", optarg);
return -EINVAL;
}
arg_since_set = true;
break;

case ARG_UNTIL:
r = parse_timestamp(optarg, &arg_until);
if (r < 0) {
log_error("Failed to parse timestamp: %s", optarg);
return -EINVAL;
}
arg_until_set = true;
break;

case '?':
return -EINVAL;

Expand All @@ -333,9 +359,19 @@ static int parse_argv(int argc, char *argv[]) {
}
}

if (arg_follow && !arg_no_tail && arg_lines < 0)
if (arg_follow && !arg_no_tail && arg_lines <= 0)
arg_lines = 10;

if (arg_since_set && arg_until_set && arg_since_set > arg_until_set) {
log_error("--since= must be before --until=.");
return -EINVAL;
}

if (arg_cursor && arg_since_set) {
log_error("Please specify either --since= or --cursor=, not both.");
return -EINVAL;
}

return 1;
}

Expand Down Expand Up @@ -734,6 +770,7 @@ int main(int argc, char *argv[]) {
sd_id128_t previous_boot_id;
bool previous_boot_id_valid = false;
bool have_pager;
unsigned n_shown = 0;

log_parse_environment();
log_open();
Expand Down Expand Up @@ -815,36 +852,24 @@ int main(int argc, char *argv[]) {
if (r < 0)
goto finish;

if (!arg_quiet) {
usec_t start, end;
char start_buf[FORMAT_TIMESTAMP_MAX], end_buf[FORMAT_TIMESTAMP_MAX];

r = sd_journal_get_cutoff_realtime_usec(j, &start, &end);
if (arg_cursor) {
r = sd_journal_seek_cursor(j, arg_cursor);
if (r < 0) {
log_error("Failed to get cutoff: %s", strerror(-r));
log_error("Failed to seek to cursor: %s", strerror(-r));
goto finish;
}

if (r > 0) {
if (arg_follow)
printf("Logs begin at %s.\n", format_timestamp(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));
}
}
r = sd_journal_next(j);

if (arg_cursor) {
r = sd_journal_seek_cursor(j, arg_cursor);
} else if (arg_since_set) {
r = sd_journal_seek_realtime_usec(j, arg_since);
if (r < 0) {
log_error("Failed to seek to cursor: %s", strerror(-r));
log_error("Failed to seek to date: %s", strerror(-r));
goto finish;
}

r = sd_journal_next(j);

} else if (arg_lines >= 0) {
} else if (arg_lines > 0) {
r = sd_journal_seek_tail(j);
if (r < 0) {
log_error("Failed to seek to tail: %s", strerror(-r));
Expand All @@ -871,12 +896,34 @@ int main(int argc, char *argv[]) {
on_tty();
have_pager = !arg_no_pager && !arg_follow && pager_open();

if (!arg_quiet) {
usec_t start, end;
char start_buf[FORMAT_TIMESTAMP_MAX], end_buf[FORMAT_TIMESTAMP_MAX];

r = sd_journal_get_cutoff_realtime_usec(j, &start, &end);
if (r < 0) {
log_error("Failed to get cutoff: %s", strerror(-r));
goto finish;
}

if (r > 0) {
if (arg_follow)
printf("---- Logs begin at %s.\n", format_timestamp(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));
}
}

for (;;) {
for (;;) {
int flags =
arg_show_all * OUTPUT_SHOW_ALL |
have_pager * OUTPUT_FULL_WIDTH |
on_tty() * OUTPUT_COLOR;
int flags;

if (arg_lines > 0 && n_shown >= arg_lines) {
r = 0;
goto finish;
}

if (need_seek) {
r = sd_journal_next(j);
Expand All @@ -889,25 +936,41 @@ int main(int argc, char *argv[]) {
if (r == 0)
break;

if (arg_until_set) {
usec_t usec;

r = sd_journal_get_realtime_usec(j, &usec);
if (r < 0) {
log_error("Failed to determine timestamp: %s", strerror(-r));
goto finish;
}
}

if (!arg_merge) {
sd_id128_t boot_id;

r = sd_journal_get_monotonic_usec(j, NULL, &boot_id);
if (r >= 0) {
if (previous_boot_id_valid &&
!sd_id128_equal(boot_id, previous_boot_id))
printf(ANSI_HIGHLIGHT_ON "----- Reboot -----" ANSI_HIGHLIGHT_OFF "\n");
printf(ANSI_HIGHLIGHT_ON "---- Reboot ----" ANSI_HIGHLIGHT_OFF "\n");

previous_boot_id = boot_id;
previous_boot_id_valid = true;
}
}

flags =
arg_show_all * OUTPUT_SHOW_ALL |
have_pager * OUTPUT_FULL_WIDTH |
on_tty() * OUTPUT_COLOR;

r = output_journal(stdout, j, arg_output, 0, flags);
if (r < 0)
goto finish;

need_seek = true;
n_shown++;
}

if (!arg_follow)
Expand Down
Loading

0 comments on commit cfbc22a

Please sign in to comment.