diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-06-03 18:06:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-03 18:06:58 -0400 |
| commit | 8c0e033f27562b3c228a370b4c2e324f4bb0590b (patch) | |
| tree | 71d60af5e0f0571db1521bfd3c722dd219862f44 /libpod | |
| parent | 81f228b20a1d634821d2ff4b009f351366641847 (diff) | |
| parent | 2414586662b905e1d3c0cf21f3cc26e628e15bdd (diff) | |
| download | podman-8c0e033f27562b3c228a370b4c2e324f4bb0590b.tar.gz podman-8c0e033f27562b3c228a370b4c2e324f4bb0590b.tar.bz2 podman-8c0e033f27562b3c228a370b4c2e324f4bb0590b.zip | |
Merge pull request #14477 from Luap99/partial-logs
podman logs k8s-file: do not reassemble partial log lines
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_log.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libpod/container_log.go b/libpod/container_log.go index 7a9eb2dbf..da6d51670 100644 --- a/libpod/container_log.go +++ b/libpod/container_log.go @@ -75,7 +75,6 @@ func (c *Container) readFromLogFile(ctx context.Context, options *logs.LogOption go func() { defer options.WaitGroup.Done() - var partial string for line := range t.Lines { select { case <-ctx.Done(): @@ -89,13 +88,6 @@ func (c *Container) readFromLogFile(ctx context.Context, options *logs.LogOption logrus.Errorf("Getting new log line: %v", err) continue } - if nll.Partial() { - partial += nll.Msg - continue - } else if !nll.Partial() && len(partial) > 0 { - nll.Msg = partial + nll.Msg - partial = "" - } nll.CID = c.ID() nll.CName = c.Name() nll.ColorID = colorID |