From 7d41c2224ed154ea3a5f1bc21bb84652afffef86 Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Wed, 15 Jul 2020 14:44:31 +0100 Subject: [PATCH] Don't close the stream (#1844) --- runtime/kubernetes/kubernetes.go | 1 - runtime/kubernetes/logs.go | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/runtime/kubernetes/kubernetes.go b/runtime/kubernetes/kubernetes.go index 088f519c..0cab6fca 100644 --- a/runtime/kubernetes/kubernetes.go +++ b/runtime/kubernetes/kubernetes.go @@ -392,7 +392,6 @@ func (k *kubeStream) Stop() error { return nil default: close(k.stop) - close(k.stream) } return nil } diff --git a/runtime/kubernetes/logs.go b/runtime/kubernetes/logs.go index ac57d50c..4c297ab3 100644 --- a/runtime/kubernetes/logs.go +++ b/runtime/kubernetes/logs.go @@ -53,7 +53,11 @@ func (k *klog) podLogStream(podName string, stream *kubeStream) error { record := runtime.LogRecord{ Message: s.Text(), } - stream.stream <- record + select { + case stream.stream <- record: + case <-stream.stop: + return stream.Error() + } } else { // TODO: is there a blocking call // rather than a sleep loop?