systemctl: show logs for correct namespace of service
This commit is contained in:
parent
21fa231ece
commit
d93dda3afe
|
@ -576,6 +576,7 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
|
||||||
show_journal_by_unit(
|
show_journal_by_unit(
|
||||||
stdout,
|
stdout,
|
||||||
i.scope,
|
i.scope,
|
||||||
|
NULL,
|
||||||
arg_output,
|
arg_output,
|
||||||
0,
|
0,
|
||||||
i.timestamp.monotonic,
|
i.timestamp.monotonic,
|
||||||
|
@ -660,6 +661,7 @@ static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line)
|
||||||
show_journal_by_unit(
|
show_journal_by_unit(
|
||||||
stdout,
|
stdout,
|
||||||
i.slice,
|
i.slice,
|
||||||
|
NULL,
|
||||||
arg_output,
|
arg_output,
|
||||||
0,
|
0,
|
||||||
i.timestamp.monotonic,
|
i.timestamp.monotonic,
|
||||||
|
|
|
@ -626,6 +626,7 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) {
|
||||||
show_journal_by_unit(
|
show_journal_by_unit(
|
||||||
stdout,
|
stdout,
|
||||||
i->unit,
|
i->unit,
|
||||||
|
NULL,
|
||||||
arg_output,
|
arg_output,
|
||||||
0,
|
0,
|
||||||
i->timestamp.monotonic,
|
i->timestamp.monotonic,
|
||||||
|
|
|
@ -1453,6 +1453,7 @@ int add_match_this_boot(sd_journal *j, const char *machine) {
|
||||||
int show_journal_by_unit(
|
int show_journal_by_unit(
|
||||||
FILE *f,
|
FILE *f,
|
||||||
const char *unit,
|
const char *unit,
|
||||||
|
const char *log_namespace,
|
||||||
OutputMode mode,
|
OutputMode mode,
|
||||||
unsigned n_columns,
|
unsigned n_columns,
|
||||||
usec_t not_before,
|
usec_t not_before,
|
||||||
|
@ -1473,7 +1474,7 @@ int show_journal_by_unit(
|
||||||
if (how_many <= 0)
|
if (how_many <= 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
r = sd_journal_open(&j, journal_open_flags);
|
r = sd_journal_open_namespace(&j, log_namespace, journal_open_flags | SD_JOURNAL_INCLUDE_DEFAULT_NAMESPACE);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_error_errno(r, "Failed to open journal: %m");
|
return log_error_errno(r, "Failed to open journal: %m");
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,7 @@ int add_matches_for_user_unit(
|
||||||
int show_journal_by_unit(
|
int show_journal_by_unit(
|
||||||
FILE *f,
|
FILE *f,
|
||||||
const char *unit,
|
const char *unit,
|
||||||
|
const char *namespace,
|
||||||
OutputMode mode,
|
OutputMode mode,
|
||||||
unsigned n_columns,
|
unsigned n_columns,
|
||||||
usec_t not_before,
|
usec_t not_before,
|
||||||
|
|
|
@ -4007,6 +4007,8 @@ typedef struct UnitStatusInfo {
|
||||||
|
|
||||||
int exit_code, exit_status;
|
int exit_code, exit_status;
|
||||||
|
|
||||||
|
const char *log_namespace;
|
||||||
|
|
||||||
usec_t condition_timestamp;
|
usec_t condition_timestamp;
|
||||||
bool condition_result;
|
bool condition_result;
|
||||||
LIST_HEAD(UnitCondition, conditions);
|
LIST_HEAD(UnitCondition, conditions);
|
||||||
|
@ -4545,6 +4547,7 @@ static void print_status_info(
|
||||||
show_journal_by_unit(
|
show_journal_by_unit(
|
||||||
stdout,
|
stdout,
|
||||||
i->id,
|
i->id,
|
||||||
|
i->log_namespace,
|
||||||
arg_output,
|
arg_output,
|
||||||
0,
|
0,
|
||||||
i->inactive_exit_timestamp_monotonic,
|
i->inactive_exit_timestamp_monotonic,
|
||||||
|
@ -5491,6 +5494,7 @@ static int show_one(
|
||||||
{ "ExecMainExitTimestamp", "t", NULL, offsetof(UnitStatusInfo, exit_timestamp) },
|
{ "ExecMainExitTimestamp", "t", NULL, offsetof(UnitStatusInfo, exit_timestamp) },
|
||||||
{ "ExecMainCode", "i", NULL, offsetof(UnitStatusInfo, exit_code) },
|
{ "ExecMainCode", "i", NULL, offsetof(UnitStatusInfo, exit_code) },
|
||||||
{ "ExecMainStatus", "i", NULL, offsetof(UnitStatusInfo, exit_status) },
|
{ "ExecMainStatus", "i", NULL, offsetof(UnitStatusInfo, exit_status) },
|
||||||
|
{ "LogNamespace", "s", NULL, offsetof(UnitStatusInfo, log_namespace) },
|
||||||
{ "ConditionTimestamp", "t", NULL, offsetof(UnitStatusInfo, condition_timestamp) },
|
{ "ConditionTimestamp", "t", NULL, offsetof(UnitStatusInfo, condition_timestamp) },
|
||||||
{ "ConditionResult", "b", NULL, offsetof(UnitStatusInfo, condition_result) },
|
{ "ConditionResult", "b", NULL, offsetof(UnitStatusInfo, condition_result) },
|
||||||
{ "Conditions", "a(sbbsi)", map_conditions, 0 },
|
{ "Conditions", "a(sbbsi)", map_conditions, 0 },
|
||||||
|
|
Loading…
Reference in a new issue