From 9198f6b38bde3e9e852a1b373466cbb687edb207 Mon Sep 17 00:00:00 2001 From: Roberto Bruggemann Date: Fri, 19 Jan 2018 14:23:13 +0000 Subject: [PATCH] logReadCloser: ensure loop terminates if channels are closed Adding the !EOF check to the loop condition ensures not reading from closed channels. --- probe/kubernetes/logreadcloser.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/probe/kubernetes/logreadcloser.go b/probe/kubernetes/logreadcloser.go index 7eabd8602..1af7e6e3f 100644 --- a/probe/kubernetes/logreadcloser.go +++ b/probe/kubernetes/logreadcloser.go @@ -84,7 +84,7 @@ func (l *logReadCloser) Read(p []byte) (int, error) { // check if there's more data to read, without blocking empty := false - for !empty && l.buffer.Len() < len(p) { + for !empty && l.buffer.Len() < len(p) && !l.isEOF() { select { case data := <-l.dataChannel: l.buffer.Write(data)