From 07edcfc6af9c1486a397792490b5075650fe350d Mon Sep 17 00:00:00 2001
From: derailed <fernand.galiana@gmail.com>
Date: Wed, 26 Feb 2020 07:36:26 -0800
Subject: [PATCH] fix #581

---
 internal/model/flash_test.go | 12 ++++--------
 internal/render/pod.go       | 21 +++++++++++++--------
 internal/ui/config.go        |  5 +++--
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/internal/model/flash_test.go b/internal/model/flash_test.go
index 9f6598f9..2749239f 100644
--- a/internal/model/flash_test.go
+++ b/internal/model/flash_test.go
@@ -40,12 +40,10 @@ func TestFlash(t *testing.T) {
 			}
 
 			time.Sleep(5 * delay)
-			s, _, l, m := v.getMetrics()
+			s, l, m := v.getMetrics()
 			assert.Equal(t, 1, s)
 			assert.Equal(t, u.level, l)
 			assert.Equal(t, u.e, m)
-			// BOZO!!
-			// assert.Equal(t, 0, c)
 		})
 	}
 }
@@ -63,12 +61,10 @@ func TestFlashBurst(t *testing.T) {
 	}
 
 	time.Sleep(5 * delay)
-	s, _, l, m := v.getMetrics()
+	s, l, m := v.getMetrics()
 	assert.Equal(t, count, s)
 	assert.Equal(t, model.FlashInfo, l)
 	assert.Equal(t, fmt.Sprintf("test-%d", count), m)
-	// BOZO!!
-	// assert.Equal(t, 0, c)
 }
 
 type flash struct {
@@ -81,8 +77,8 @@ func newFlash() *flash {
 	return &flash{}
 }
 
-func (f *flash) getMetrics() (int, int, model.FlashLevel, string) {
-	return f.set, f.clear, f.level, f.msg
+func (f *flash) getMetrics() (int, model.FlashLevel, string) {
+	return f.set, f.level, f.msg
 }
 
 func (f *flash) listen(c model.FlashChan) {
diff --git a/internal/render/pod.go b/internal/render/pod.go
index fa5d6573..1076a725 100644
--- a/internal/render/pod.go
+++ b/internal/render/pod.go
@@ -8,6 +8,7 @@ import (
 	"github.com/derailed/k9s/internal/client"
 	"github.com/derailed/tview"
 	"github.com/gdamore/tcell"
+	"github.com/rs/zerolog/log"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -23,28 +24,32 @@ type Pod struct{}
 // ColorerFunc colors a resource row.
 func (p Pod) ColorerFunc() ColorerFunc {
 	return func(ns string, h Header, re RowEvent) tcell.Color {
+		c := DefaultColorer(ns, h, re)
+
 		statusCol := h.IndexOf("STATUS", true)
 		if statusCol == -1 {
-			return DefaultColorer(ns, h, re)
+			return c
 		}
 		status := strings.TrimSpace(re.Row.Fields[statusCol])
 		switch status {
 		case ContainerCreating, PodInitializing:
-			return AddColor
+			c = AddColor
 		case Initialized:
-			return HighlightColor
+			c = HighlightColor
 		case Completed:
-			return CompletedColor
+			c = CompletedColor
 		case Running:
-			return StdColor
+			c = StdColor
 		case Terminating:
-			return KillColor
+			c = KillColor
 		default:
 			if !Happy(ns, h, re.Row) {
-				return ErrColor
+				c = ErrColor
 			}
-			return DefaultColorer(ns, h, re)
 		}
+
+		log.Debug().Msgf("STATUS %s -- %#v", status, c)
+		return c
 	}
 }
 
diff --git a/internal/ui/config.go b/internal/ui/config.go
index a448f87d..17640570 100644
--- a/internal/ui/config.go
+++ b/internal/ui/config.go
@@ -152,10 +152,11 @@ func (c *Configurator) updateStyles(f string) {
 	}
 	c.Styles.Update()
 
-	render.StdColor = c.Styles.Frame().Status.NewColor.Color()
-	render.AddColor = c.Styles.Frame().Status.AddColor.Color()
 	render.ModColor = c.Styles.Frame().Status.ModifyColor.Color()
+	render.AddColor = c.Styles.Frame().Status.AddColor.Color()
 	render.ErrColor = c.Styles.Frame().Status.ErrorColor.Color()
+	render.StdColor = c.Styles.Frame().Status.NewColor.Color()
 	render.HighlightColor = c.Styles.Frame().Status.HighlightColor.Color()
+	render.KillColor = c.Styles.Frame().Status.KillColor.Color()
 	render.CompletedColor = c.Styles.Frame().Status.CompletedColor.Color()
 }