sd-journal: watch logs below container's /{var,run}/log/journal (instead of the ...
authorEvgeny Vereshchagin <evvers@ya.ru>
Tue, 9 Aug 2016 12:49:32 +0000 (15:49 +0300)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 9 Aug 2016 12:49:32 +0000 (08:49 -0400)
Fixes #3927.

src/journal/sd-journal.c

index 75a0ffb..2a3824d 100644 (file)
@@ -2290,6 +2290,8 @@ _public_ int sd_journal_get_fd(sd_journal *j) {
          * inotify */
         if (j->no_new_files)
                 r = add_current_paths(j);
+        else if (j->flags & SD_JOURNAL_OS_ROOT)
+                r = add_search_paths(j);
         else if (j->toplevel_fd >= 0)
                 r = add_root_directory(j, NULL, false);
         else if (j->path)