From c3607c23e728f87aa28d02185d3c5ce210392afe Mon Sep 17 00:00:00 2001 From: Jake Sanders Date: Tue, 17 Dec 2019 16:27:17 +0000 Subject: [PATCH] Fix after merge --- debug/log/kubernetes/kubernetes.go | 6 +++--- debug/log/kubernetes/kubernetes_test.go | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debug/log/kubernetes/kubernetes.go b/debug/log/kubernetes/kubernetes.go index 529b5d7c..df8e2a6d 100644 --- a/debug/log/kubernetes/kubernetes.go +++ b/debug/log/kubernetes/kubernetes.go @@ -13,10 +13,10 @@ func (k *klog) Write(l log.Record) { write(l) } -func (k *klog) Stream(stop chan bool) <-chan log.Record { - c := make(chan log.Record) +func (k *klog) Stream() (<-chan log.Record, chan bool) { + c, s := make(chan log.Record), make(chan bool) go close(c) - return c + return c, s } // New returns a configured Kubernetes logger diff --git a/debug/log/kubernetes/kubernetes_test.go b/debug/log/kubernetes/kubernetes_test.go index c1eca93d..8fac8c08 100644 --- a/debug/log/kubernetes/kubernetes_test.go +++ b/debug/log/kubernetes/kubernetes_test.go @@ -41,11 +41,12 @@ func TestKubernetes(t *testing.T) { assert.Nil(t, k.Read(), "Read should be unimplemented") - stream := k.Stream(make(chan bool)) + stream, stop := k.Stream() records := []log.Record{} for s := range stream { records = append(records, s) } + close(stop) assert.Equal(t, 0, len(records), "Stream should be unimplemented") }