summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-06-03 18:28:12 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-06-04 09:59:06 -0400
commit5ec76417764e19486261fb8e38e8e71b28185b37 (patch)
tree23711ec8f62b1d253eba848160bdce45b3a672d9 /src/shared
parent7c1b8f043ed3d23663549dd6084c5a4de51b8e28 (diff)
systemctl: limit logs in status to current boot
Also reworded a few debug messages for brevity, and added a log statement which prints out the filter at debug level: Journal filter: (((UNIT=sys-module-configfs.device AND _PID=1) OR (COREDUMP_UNIT=sys-module-configfs.device AND MESSAGE_ID=fc2e22bc6ee647b6b90729ab34a250b1) OR _SYSTEMD_UNIT=sys-module-configfs.device) AND _BOOT_ID=4e3c518ab0474c12ac8de7896fe6b154)
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/logs-show.c33
-rw-r--r--src/shared/logs-show.h2
2 files changed, 35 insertions, 0 deletions
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 116dc8a36c..79a977c156 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -931,6 +931,33 @@ int add_matches_for_user_unit(sd_journal *j, const char *unit, uid_t uid) {
return r;
}
+int add_match_this_boot(sd_journal *j) {
+ char match[9+32+1] = "_BOOT_ID=";
+ sd_id128_t boot_id;
+ int r;
+
+ assert(j);
+
+ 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;
+ }
+
+ r = sd_journal_add_conjunction(j);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
int show_journal_by_unit(
FILE *f,
const char *unit,
@@ -957,6 +984,10 @@ int show_journal_by_unit(
if (r < 0)
return r;
+ r = add_match_this_boot(j);
+ if (r < 0)
+ return r;
+
if (system)
r = add_matches_for_unit(j, unit);
else
@@ -964,6 +995,8 @@ int show_journal_by_unit(
if (r < 0)
return r;
+ log_debug("Journal filter: %s", journal_make_match_string(j));
+
r = show_journal(f, j, mode, n_columns, not_before, how_many, flags);
if (r < 0)
return r;
diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index b0f93a661a..c9a9ad3e91 100644
--- a/src/shared/logs-show.h
+++ b/src/shared/logs-show.h
@@ -37,6 +37,8 @@ int output_journal(
unsigned n_columns,
OutputFlags flags);
+int add_match_this_boot(sd_journal *j);
+
int add_matches_for_unit(
sd_journal *j,
const char *unit);