#include <sys/poll.h>
#include <time.h>
#include <getopt.h>
+#include <sys/stat.h>
#include <systemd/sd-journal.h>
#include "log.h"
#include "util.h"
+#include "path-util.h"
#include "build.h"
#include "pager.h"
#include "logs-show.h"
+#include "strv.h"
static OutputMode arg_output = OUTPUT_SHORT;
static bool arg_follow = false;
static bool arg_new_id128 = false;
static bool arg_quiet = false;
static bool arg_local = false;
+static bool arg_this_boot = false;
+static const char *arg_directory = NULL;
static int help(void) {
" -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",
+ " -l --local Only local entries\n"
+ " -b --this-boot Show data only from current boot\n"
+ " -D --directory=PATH Show journal files from directory\n"
+ " --new-id128 Generate a new 128 Bit id\n",
program_invocation_short_name);
return 0;
{ "new-id128", no_argument, NULL, ARG_NEW_ID128 },
{ "quiet", no_argument, NULL, 'q' },
{ "local", no_argument, NULL, 'l' },
+ { "this-boot", no_argument, NULL, 'b' },
+ { "directory", required_argument, NULL, 'D' },
{ NULL, 0, NULL, 0 }
};
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "hfo:an:ql", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hfo:an:qlbD:", options, NULL)) >= 0) {
switch (c) {
arg_local = true;
break;
+ case 'b':
+ arg_this_boot = true;
+ break;
+
+ case 'D':
+ arg_directory = optarg;
+ break;
+
case '?':
return -EINVAL;
return 0;
}
+static int add_matches(sd_journal *j, char **args) {
+ char **i;
+ int r;
+
+ assert(j);
+
+ STRV_FOREACH(i, args) {
+
+ if (path_is_absolute(*i)) {
+ char *p;
+ const char *path;
+ struct stat st;
+
+ p = canonicalize_file_name(*i);
+ path = p ? p : *i;
+
+ if (stat(path, &st) < 0) {
+ free(p);
+ log_error("Couldn't stat file: %m");
+ return -errno;
+ }
+
+ 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");
+ return -ENOMEM;
+ }
+
+ 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", *i);
+ return -EINVAL;
+ }
+
+ free(p);
+ } else
+ r = sd_journal_add_match(j, *i, strlen(*i));
+
+ if (r < 0) {
+ log_error("Failed to add match: %s", strerror(-r));
+ return r;
+ }
+ }
+
+ return 0;
+}
+
+static int add_this_boot(sd_journal *j) {
+ char match[9+32+1] = "_BOOT_ID=";
+ sd_id128_t boot_id;
+ int r;
+
+ if (!arg_this_boot)
+ return 0;
+
+ r = sd_id128_get_boot(&boot_id);
+ if (r < 0) {
+ log_error("Failed to get boot id: %s", strerror(-r));
+ return r;
+ }
+
+ sd_id128_to_string(boot_id, match + 9);
+ r = sd_journal_add_match(j, match, strlen(match));
+ if (r < 0) {
+ log_error("Failed to add match: %s", strerror(-r));
+ return r;
+ }
+
+ return 0;
+}
+
int main(int argc, char *argv[]) {
- int r, i, fd;
+ int r;
sd_journal *j = NULL;
unsigned line = 0;
bool need_seek = false;
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 (arg_directory)
+ r = sd_journal_open_directory(&j, arg_directory, 0);
+ else
+ 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]));
+ r = add_this_boot(j);
+ if (r < 0)
+ goto finish;
+
+ r = add_matches(j, argv + optind);
+ 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 (r < 0) {
- log_error("Failed to add match: %s", strerror(-r));
+ log_error("Failed to get cutoff: %s", strerror(-r));
goto finish;
}
- }
- fd = sd_journal_get_fd(j);
- if (fd < 0) {
- log_error("Failed to get wakeup fd: %s", strerror(-fd));
- 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));
+ }
}
if (arg_lines >= 0) {
if (!arg_follow)
break;
- 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;
- }
-
- r = sd_journal_process(j);
+ r = sd_journal_wait(j, (uint64_t) -1);
if (r < 0) {
- log_error("Failed to process: %s", strerror(-r));
+ log_error("Couldn't wait for log event: %s", strerror(-r));
goto finish;
}
}