jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update popeye

mine
derailed 2019-04-06 21:50:59 -06:00
parent c86e8f4bd2
commit c2a15badd1
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -2,7 +2,7 @@ module github.com/derailed/k9s
require ( require (
contrib.go.opencensus.io/exporter/ocagent v0.4.11 // indirect contrib.go.opencensus.io/exporter/ocagent v0.4.11 // indirect
github.com/derailed/popeye v0.1.2 github.com/derailed/popeye v0.1.5
github.com/derailed/tview v0.1.4 github.com/derailed/tview v0.1.4
github.com/fatih/camelcase v1.0.0 // indirect github.com/fatih/camelcase v1.0.0 // indirect
github.com/gdamore/tcell v1.1.1 github.com/gdamore/tcell v1.1.1

4
go.sum
View File

@ -40,6 +40,10 @@ github.com/derailed/popeye v0.1.0 h1:r4WBPb7sON6kpvCuqxTbGCh9GtwAgN27vkPjWSMAa8s
github.com/derailed/popeye v0.1.0/go.mod h1:2tTv7ge9s/Z4ZiZU+hHo2no07bbg5+DlBFnuVpR3cqQ= github.com/derailed/popeye v0.1.0/go.mod h1:2tTv7ge9s/Z4ZiZU+hHo2no07bbg5+DlBFnuVpR3cqQ=
github.com/derailed/popeye v0.1.1 h1:KHEhapc3g/GebHkKXJsvlujWIimPfdU1UJ584Rb2UHk= github.com/derailed/popeye v0.1.1 h1:KHEhapc3g/GebHkKXJsvlujWIimPfdU1UJ584Rb2UHk=
github.com/derailed/popeye v0.1.1/go.mod h1:/FlF4pGIupvlmwqidGEkIYYIQMekSO+WOJ+2Sr5vH5g= github.com/derailed/popeye v0.1.1/go.mod h1:/FlF4pGIupvlmwqidGEkIYYIQMekSO+WOJ+2Sr5vH5g=
github.com/derailed/popeye v0.1.2 h1:KNK18C047bwevnI5H612tEcv93i8++aqwyXwdyPkJLM=
github.com/derailed/popeye v0.1.2/go.mod h1:/FlF4pGIupvlmwqidGEkIYYIQMekSO+WOJ+2Sr5vH5g=
github.com/derailed/popeye v0.1.5 h1:3yHRXUeug8oJtbByquJ+d9M3T/uXrm97vItGhH4UHaE=
github.com/derailed/popeye v0.1.5/go.mod h1:ZZw8cFk2VWY8+/PObmSbJgUotxMB1/OegGrzQfRvePo=
github.com/derailed/tview v0.1.3 h1:2/Rz0Sdfg3tepSKt4yCcY2g8IlRtPTrA4UYIQJZs6DI= github.com/derailed/tview v0.1.3 h1:2/Rz0Sdfg3tepSKt4yCcY2g8IlRtPTrA4UYIQJZs6DI=
github.com/derailed/tview v0.1.3/go.mod h1:WRYVfgb2PBMLZ/muaSpOc/4H4fYsOPnHOaGnBoJ+hGE= github.com/derailed/tview v0.1.3/go.mod h1:WRYVfgb2PBMLZ/muaSpOc/4H4fYsOPnHOaGnBoJ+hGE=
github.com/derailed/tview v0.1.4 h1:6ZtMtb5+2bbGNH7SldHGcVB8GnSTXKIQwKxWRNb6DxY= github.com/derailed/tview v0.1.4 h1:6ZtMtb5+2bbGNH7SldHGcVB8GnSTXKIQwKxWRNb6DxY=

12
internal/views/popeye.go
View File

@ -2,6 +2,7 @@ package views
import ( import (
"context" "context"
"fmt"
"io" "io"
"os" "os"
"path/filepath" "path/filepath"
@ -38,9 +39,16 @@ func newPopeyeView(app *appView) *popeyeView {
} }
func (v *popeyeView) init(ctx context.Context, ns string) { func (v *popeyeView) init(ctx context.Context, ns string) {
defer func() {
if err := recover(); err != nil {
v.app.flash(flashErr, fmt.Sprintf("%v", err))
}
}()
c := cfg.New() c := cfg.New()
spinach := filepath.Join(config.K9sHome, "spinach.yml") spinach := filepath.Join(config.K9sHome, "spinach.yml")
if _, err := os.Stat(spinach); err == nil { if _, err := os.Stat(spinach); err == nil {
c.Spinach = spinach c.Spinach = spinach
} }
@ -53,8 +61,8 @@ func (v *popeyeView) init(ctx context.Context, ns string) {
log.Error().Err(err).Msg("Unable to load spinach config") log.Error().Err(err).Msg("Unable to load spinach config")
} }
p := pkg.NewPopeye(c, v.ansiWriter) p := pkg.NewPopeye(c, &log.Logger, v.ansiWriter)
p.Sanitize() p.Sanitize(false)
} }
func (v *popeyeView) getTitle() string { func (v *popeyeView) getTitle() string {