taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Handle error handling better

Browse Source 
Don't panic
Add function due to reuse
Catch all errors to appease CI
This commit is contained in:
Sean Smith 2020-10-07 00:15:35 -04:00
parent 57bf5c7417
commit 34154620f6
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/cmdrunner/widget.go
View File

@ -125,22 +125,26 @@ func runCommandLoop(widget *Widget) {
cmd := exec.Command(widget.settings.cmd, widget.settings.args...) cmd := exec.Command(widget.settings.cmd, widget.settings.args...)
cmd.Env = widget.environment() cmd.Env = widget.environment()
f, err := pty.Start(cmd) f, err := pty.Start(cmd)
if err != nil {
panic(err)
}
io.Copy(widget.buffer, f)
// The command has exited, print any error messages // The command has exited, print any error messages
if err != nil { if err != nil {
widget.handleError(err)
}
_, err = io.Copy(widget.buffer, f)
if err != nil {
widget.handleError(err)
}
widget.redrawChan <- true
}
}
func (widget *Widget) handleError(err error) {
widget.m.Lock() widget.m.Lock()
_, writeErr := widget.buffer.WriteString(err.Error()) _, writeErr := widget.buffer.WriteString(err.Error())
if writeErr != nil { if writeErr != nil {
return return
} }
widget.m.Unlock() widget.m.Unlock()
}
widget.redrawChan <- true
}
} }
func redrawLoop(widget *Widget) { func redrawLoop(widget *Widget) {