diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-27 12:02:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 12:02:25 -0400 |
| commit | 87f892e5b56c2fab2f394f8cc79794ccce03f510 (patch) | |
| tree | 1ba831a9dddfb6927698bcb9e0c2bee913ad0dcb /libpod/container_log_linux.go | |
| parent | c57b5c9b831695f8c54d11b4f288d6037c096fea (diff) | |
| parent | 983cfb90e68d7b292b0f6ee8800c3f23383493cc (diff) | |
| download | podman-87f892e5b56c2fab2f394f8cc79794ccce03f510.tar.gz podman-87f892e5b56c2fab2f394f8cc79794ccce03f510.tar.bz2 podman-87f892e5b56c2fab2f394f8cc79794ccce03f510.zip | |
Merge pull request #15076 from mheon/bump_420_rc2
Bump to v4.2.0-RC2
Diffstat (limited to 'libpod/container_log_linux.go')
| -rw-r--r-- | libpod/container_log_linux.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go index 0686caed2..7e95f2449 100644 --- a/libpod/container_log_linux.go +++ b/libpod/container_log_linux.go @@ -178,8 +178,13 @@ func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOption if !options.Follow || !containerCouldBeLogging { return } - // Sleep until something's happening on the journal. - journal.Wait(sdjournal.IndefiniteWait) + + // journal.Wait() is blocking, this would cause the goroutine to hang forever + // if no more journal entries are generated and thus if the client + // has closed the connection in the meantime to leak memory. + // Waiting only 5 seconds makes sure we can check if the client closed in the + // meantime at least every 5 seconds. + journal.Wait(5 * time.Second) continue } lastReadCursor = cursor |