systemctl: show logs for correct namespace of service

2020-01-31 15:02:52 +01:00
parent 21fa231ece
commit d93dda3afe
5 changed files with 10 additions and 1 deletions
@@ -1453,6 +1453,7 @@ int add_match_this_boot(sd_journal *j, const char *machine) {
 int show_journal_by_unit(
                FILE *f,
                const char *unit,
+                const char *log_namespace,
                OutputMode mode,
                unsigned n_columns,
                usec_t not_before,
@@ -1473,7 +1474,7 @@ int show_journal_by_unit(
        if (how_many <= 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)
                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(
                FILE *f,
                const char *unit,
+                const char *namespace,
                OutputMode mode,
                unsigned n_columns,
                usec_t not_before,