summaryrefslogtreecommitdiffstats
path: root/src/systemctl/systemctl.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-11-27 12:13:59 +0100
committerLennart Poettering <lennart@poettering.net>2020-01-31 15:02:52 +0100
commitd93dda3afef4d8bfae8e4d20122adfa5e2cc41f8 (patch)
tree1307dd0fdc7ef41b5b4d507920c1ac66324e539e /src/systemctl/systemctl.c
parentjournalctl: drop misplaced empty line (diff)
downloadsystemd-d93dda3afef4d8bfae8e4d20122adfa5e2cc41f8.tar.xz
systemd-d93dda3afef4d8bfae8e4d20122adfa5e2cc41f8.zip
systemctl: show logs for correct namespace of service
Diffstat (limited to '')
-rw-r--r--src/systemctl/systemctl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 60872bc537..5547058296 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4007,6 +4007,8 @@ typedef struct UnitStatusInfo {
int exit_code, exit_status;
+ const char *log_namespace;
+
usec_t condition_timestamp;
bool condition_result;
LIST_HEAD(UnitCondition, conditions);
@@ -4545,6 +4547,7 @@ static void print_status_info(
show_journal_by_unit(
stdout,
i->id,
+ i->log_namespace,
arg_output,
0,
i->inactive_exit_timestamp_monotonic,
@@ -5491,6 +5494,7 @@ static int show_one(
{ "ExecMainExitTimestamp", "t", NULL, offsetof(UnitStatusInfo, exit_timestamp) },
{ "ExecMainCode", "i", NULL, offsetof(UnitStatusInfo, exit_code) },
{ "ExecMainStatus", "i", NULL, offsetof(UnitStatusInfo, exit_status) },
+ { "LogNamespace", "s", NULL, offsetof(UnitStatusInfo, log_namespace) },
{ "ConditionTimestamp", "t", NULL, offsetof(UnitStatusInfo, condition_timestamp) },
{ "ConditionResult", "b", NULL, offsetof(UnitStatusInfo, condition_result) },
{ "Conditions", "a(sbbsi)", map_conditions, 0 },