From 07552d10ddfdee2e8040b17f22e64edee435c618 Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Wed, 15 Jun 2022 20:29:33 +0200 Subject: [PATCH] Tidy --- logs/pod_watcher.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/logs/pod_watcher.go b/logs/pod_watcher.go index 40139b3..dbaf421 100644 --- a/logs/pod_watcher.go +++ b/logs/pod_watcher.go @@ -216,22 +216,22 @@ func copyLogStream(ctx context.Context, wg *sync.WaitGroup, client KubernetesCli // Closing the reader ensures that the goroutine below is not leaked. defer func() { _ = logReader.Close() }() - done := make(chan error, 1) + errch := make(chan error, 1) go func() { - defer close(done) + defer close(errch) scanner := bufio.NewScanner(logReader) for scanner.Scan() { logsLines <- "[" + stream.podName + "] " + scanner.Text() + nl } if err := scanner.Err(); err != nil { - done <- newLogError(fmt.Errorf("error scanning logs: %v", err), stream) + errch <- newLogError(fmt.Errorf("error scanning logs: %v", err), stream) return } }() for { select { - case err := <-done: + case err := <-errch: return err case <-stream.done: return nil