Merge pull request #7893 from ashley-cui/journald

Fix Podman logs reading journald
containers · Oct 2, 2020 · 1132bcf · 1132bcf
2 parents b58980a + c0d1954
commit 1132bcf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go
@@ -33,7 +33,7 @@ const (
 func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOptions, logChannel chan *logs.LogLine) error {
 	var config journal.JournalReaderConfig
 	if options.Tail < 0 {
-		config.NumFromTail = math.MaxUint64
+		config.NumFromTail = 0
 	} else {
 		config.NumFromTail = uint64(options.Tail)
 	}

diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
@@ -203,6 +203,7 @@ var _ = Describe("Podman logs", func() {
 		results.WaitWithDefaultTimeout()
 		Expect(results).To(Exit(0))
 		Expect(len(results.OutputToStringArray())).To(Equal(3))
+		Expect(results.OutputToString()).To(Equal("podman podman podman"))
 	})
 
 	It("using journald tail two lines", func() {

diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats
@@ -50,4 +50,15 @@ ${cid[1]} c
 ${cid[0]} d"   "Sequential output from logs"
 }
 
+@test "podman logs over journald" {
+    msg=$(random_string 20)
+
+    run_podman run --name myctr --log-driver journald $IMAGE echo $msg
+
+    run_podman logs myctr
+    is "$output" "$msg" "check that log output equals the container output"
+
+    run_podman rm myctr
+}
+
 # vim: filetype=sh