Merge pull request #12525 from mheon/bump_343

Backports for and bump to v3.4.3

1 files changed, 16 insertions, 10 deletions

diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go
index b6b780bab..90da8053d 100644
--- a/libpod/container_log_linux.go
+++ b/libpod/container_log_linux.go
@@ -37,13 +37,21 @@ func (c *Container) initializeJournal(ctx context.Context) error {
 	m := make(map[string]string)
 	m["SYSLOG_IDENTIFIER"] = "podman"
 	m["PODMAN_ID"] = c.ID()
-	m["CONTAINER_ID_FULL"] = c.ID()
 	history := events.History
 	m["PODMAN_EVENT"] = history.String()
+	container := events.Container
+	m["PODMAN_TYPE"] = container.String()
+	m["PODMAN_TIME"] = time.Now().Format(time.RFC3339Nano)
 	return journal.Send("", journal.PriInfo, m)
 }
 
 func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOptions, logChannel chan *logs.LogLine) error {
+	// We need the container's events in the same journal to guarantee
+	// consistency, see #10323.
+	if options.Follow && c.runtime.config.Engine.EventsLogger != "journald" {
+		return errors.Errorf("using --follow with the journald --log-driver but without the journald --events-backend (%s) is not supported", c.runtime.config.Engine.EventsLogger)
+	}
+
 	journal, err := sdjournal.NewJournal()
 	if err != nil {
 		return err
@@ -89,6 +97,7 @@ func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOption
 	// exponential backoff.
 	var cursor string
 	var cursorError error
+	var containerCouldBeLogging bool
 	for i := 1; i <= 3; i++ {
 		cursor, cursorError = journal.GetCursor()
 		hundreds := 1
@@ -105,12 +114,6 @@ func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOption
 		return errors.Wrap(cursorError, "initial journal cursor")
 	}
 
-	// We need the container's events in the same journal to guarantee
-	// consistency, see #10323.
-	if options.Follow && c.runtime.config.Engine.EventsLogger != "journald" {
-		return errors.Errorf("using --follow with the journald --log-driver but without the journald --events-backend (%s) is not supported", c.runtime.config.Engine.EventsLogger)
-	}
-
 	options.WaitGroup.Add(1)
 	go func() {
 		defer func() {
@@ -173,7 +176,7 @@ func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOption
 					doTailFunc()
 				}
 				// Unless we follow, quit.
-				if !options.Follow {
+				if !options.Follow || !containerCouldBeLogging {
 					return
 				}
 				// Sleep until something's happening on the journal.
@@ -202,11 +205,14 @@ func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOption
 					logrus.Errorf("Failed to translate event: %v", err)
 					return
 				}
-				if status == events.Exited {
+				switch status {
+				case events.History, events.Init, events.Start, events.Restart:
+					containerCouldBeLogging = true
+				case events.Exited:
+					containerCouldBeLogging = false
 					if doTail {
 						doTailFunc()
 					}
-					return
 				}
 				continue
 			}