X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=6929b7601867302d466abf960f3324eb4acb5016;hp=4d9864729b2a9b0516bbd411955e86ff6b3adfd1;hb=59cea26a349cfa8db906b520dac72563dd773ff2;hpb=d3f2bdbfee94a4cd124b66e610f4b926b749e192
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 4d9864729..6929b7601 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -6,16 +6,16 @@
Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
@@ -29,11 +29,13 @@
#include
#include
#include
+#include
#include
#include "log.h"
#include "util.h"
+#include "path-util.h"
#include "build.h"
#include "pager.h"
#include "logs-show.h"
@@ -45,20 +47,26 @@ static bool arg_no_pager = false;
static int arg_lines = -1;
static bool arg_no_tail = false;
static bool arg_new_id128 = false;
+static bool arg_quiet = false;
+static bool arg_local = false;
+static bool arg_this_boot = false;
static int help(void) {
- printf("%s [OPTIONS...] {COMMAND} ...\n\n"
+ printf("%s [OPTIONS...] [MATCH]\n\n"
"Send control commands to or query the journal.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
- " -a --all Show all properties, including long and unprintable\n"
+ " -a --all Show all fields, including long and unprintable\n"
" -f --follow Follow journal\n"
" -n --lines=INTEGER Journal entries to show\n"
" --no-tail Show all lines, even in follow mode\n"
" -o --output=STRING Change journal output mode (short, short-monotonic,\n"
" verbose, export, json, cat)\n"
+ " -q --quiet Don't show privilege warning\n"
+ " -l --local Only local entries\n"
+ " -b --this-boot Show data only from current boot\n"
" --new-id128 Generate a new 128 Bit id\n",
program_invocation_short_name);
@@ -84,6 +92,9 @@ static int parse_argv(int argc, char *argv[]) {
{ "lines", required_argument, NULL, 'n' },
{ "no-tail", no_argument, NULL, ARG_NO_TAIL },
{ "new-id128", no_argument, NULL, ARG_NEW_ID128 },
+ { "quiet", no_argument, NULL, 'q' },
+ { "local", no_argument, NULL, 'l' },
+ { "this-boot", no_argument, NULL, 'b' },
{ NULL, 0, NULL, 0 }
};
@@ -92,7 +103,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "hfo:an:", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hfo:an:qlb", options, NULL)) >= 0) {
switch (c) {
@@ -143,6 +154,18 @@ static int parse_argv(int argc, char *argv[]) {
arg_new_id128 = true;
break;
+ case 'q':
+ arg_quiet = true;
+ break;
+
+ case 'l':
+ arg_local = true;
+ break;
+
+ case 'b':
+ arg_this_boot = true;
+ break;
+
case '?':
return -EINVAL;
@@ -152,7 +175,7 @@ static int parse_argv(int argc, char *argv[]) {
}
}
- if (arg_follow && !arg_no_tail)
+ if (arg_follow && !arg_no_tail && arg_lines < 0)
arg_lines = 10;
return 1;
@@ -191,6 +214,7 @@ int main(int argc, char *argv[]) {
sd_journal *j = NULL;
unsigned line = 0;
bool need_seek = false;
+ struct stat st;
log_parse_environment();
log_open();
@@ -204,14 +228,73 @@ int main(int argc, char *argv[]) {
goto finish;
}
- r = sd_journal_open(&j, 0);
+#ifdef HAVE_ACL
+ if (!arg_quiet && geteuid() != 0 && in_group("adm") <= 0)
+ 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 (r < 0) {
log_error("Failed to open journal: %s", strerror(-r));
goto finish;
}
+ if (arg_this_boot) {
+ char match[9+32+1] = "_BOOT_ID=";
+ sd_id128_t boot_id;
+
+ r = sd_id128_get_boot(&boot_id);
+ if (r < 0) {
+ log_error("Failed to get boot id: %s", strerror(-r));
+ goto finish;
+ }
+
+ 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));
+ goto finish;
+ }
+ }
+
for (i = optind; i < argc; i++) {
- r = sd_journal_add_match(j, argv[i], strlen(argv[i]));
+ if (path_is_absolute(argv[i])) {
+ char *p = NULL;
+ const char *path;
+
+ p = canonicalize_file_name(argv[i]);
+ path = p ? p : argv[i];
+
+ if (stat(path, &st) < 0) {
+ free(p);
+ log_error("Couldn't stat file: %m");
+ r = -errno;
+ goto finish;
+ }
+
+ 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");
+ goto finish;
+ }
+
+ 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", argv[i]);
+ goto finish;
+ }
+
+ free(p);
+ } else
+ r = sd_journal_add_match(j, argv[i], strlen(argv[i]));
+
if (r < 0) {
log_error("Failed to add match: %s", strerror(-r));
goto finish;
@@ -224,6 +307,26 @@ int main(int argc, char *argv[]) {
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 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));
+ }
+ }
+
if (arg_lines >= 0) {
r = sd_journal_seek_tail(j);
if (r < 0) {
@@ -272,7 +375,7 @@ int main(int argc, char *argv[]) {
line ++;
- r = output_journal(j, arg_output, line, arg_show_all);
+ r = output_journal(j, arg_output, line, 0, arg_show_all);
if (r < 0)
goto finish;
@@ -282,7 +385,7 @@ int main(int argc, char *argv[]) {
if (!arg_follow)
break;
- r = fd_wait_for_event(fd, POLLIN);
+ 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;