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

clean and bugs fixes

mine
derailed 2019-05-30 11:06:38 -06:00
parent ebf2bafefb
commit 49f6f7234a
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/views/container.go
View File

@ -173,19 +173,19 @@ func (v *containerView) portFwdCmd(evt *tcell.EventKey) *tcell.EventKey {
log.Debug().Msgf(">>> Starting port forward %q %v", *v.path, ports) log.Debug().Msgf(">>> Starting port forward %q %v", *v.path, ports)
go func(f *portforward.PortForwarder) { go func(f *portforward.PortForwarder) {
v.app.QueueUpdate(func() { v.app.QueueUpdateDraw(func() {
v.app.forwarders = append(v.app.forwarders, pf) v.app.forwarders = append(v.app.forwarders, pf)
v.app.flash().infof("PortForward activated %s:%s", pf.Path(), pf.Ports()[0]) v.app.flash().infof("PortForward activated %s:%s", pf.Path(), pf.Ports()[0])
v.app.gotoResource("pf", true) v.dismissModal()
}) })
pf.SetActive(true) pf.SetActive(true)
if err := f.ForwardPorts(); err != nil { if err := f.ForwardPorts(); err != nil {
v.app.QueueUpdate(func() { log.Error().Err(err).Msg("Port forward failed")
v.app.QueueUpdateDraw(func() {
if len(v.app.forwarders) > 0 { if len(v.app.forwarders) > 0 {
v.app.forwarders = v.app.forwarders[:len(v.app.forwarders)-1] v.app.forwarders = v.app.forwarders[:len(v.app.forwarders)-1]
} }
pf.SetActive(false) pf.SetActive(false)
log.Error().Err(err).Msg("Port forward failed")
v.app.flash().errf("PortForward failed %s", err) v.app.flash().errf("PortForward failed %s", err)
}) })
} }

2
internal/views/flash.go
View File

@ -16,7 +16,7 @@ const (
flashWarn flashWarn
flashErr flashErr
flashFatal flashFatal
flashDelay = 2 flashDelay = 3
emoDoh = "😗" emoDoh = "😗"
emoRed = "😡" emoRed = "😡"

11
internal/views/forward.go
View File

@ -75,6 +75,7 @@ func (v *forwardView) getTV() *tableView {
func (v *forwardView) reload() { func (v *forwardView) reload() {
path := benchConfig(v.app.config.K9s.CurrentCluster) path := benchConfig(v.app.config.K9s.CurrentCluster)
log.Debug().Msgf("Reloading config %s", path)
if err := v.app.bench.Reload(path); err != nil { if err := v.app.bench.Reload(path); err != nil {
log.Error().Err(err).Msg("Bench config reload") log.Error().Err(err).Msg("Bench config reload")
v.app.flash().err(err) v.app.flash().err(err)
@ -328,17 +329,13 @@ func watchFS(ctx context.Context, app *appView, dir, file string, cb func()) err
return err return err
} }
path := filepath.Join(dir, file)
if file == "" {
path = ""
}
go func() { go func() {
for { for {
select { select {
case evt := <-w.Events: case evt := <-w.Events:
log.Debug().Msgf("Event %#v", evt) log.Debug().Msgf("FS %s event %v", file, evt.Name)
if file == "" || evt.Name == path { if file == "" || evt.Name == file {
log.Debug().Msgf("FS %s event %v", dir, evt) log.Debug().Msgf("Capuring Event %#v", evt)
app.QueueUpdateDraw(func() { app.QueueUpdateDraw(func() {
cb() cb()
}) })

5
main.go
View File

@ -17,11 +17,6 @@ func init() {
func main() { func main() {
mod := os.O_CREATE | os.O_APPEND | os.O_WRONLY mod := os.O_CREATE | os.O_APPEND | os.O_WRONLY
file, err := os.OpenFile(config.K9sLogs, mod, config.DefaultFileMod) file, err := os.OpenFile(config.K9sLogs, mod, config.DefaultFileMod)
defer func() {
if file != nil {
file.Close()
}
}()
if err != nil { if err != nil {
panic(err) panic(err)
} }