mirror of
https://codeberg.org/frosty/modbot.git
synced 2024-09-19 03:36:35 -04:00
add some checks for whether exec cmd exits non-0 or output is blank
This commit is contained in:
parent
fe651bdf28
commit
79a40f82f5
|
@ -18,6 +18,7 @@ package readers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"errors"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
@ -36,6 +37,10 @@ func readExec(command string) (interface{}, error) {
|
||||||
return ExecInfo(""), err
|
return ExecInfo(""), err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if cmd.ProcessState.ExitCode() != 0 {
|
||||||
|
return ExecInfo(""), errors.New("returned non-zero exit code")
|
||||||
|
}
|
||||||
|
|
||||||
outputLines := strings.Split(stdout.String(), "\n")
|
outputLines := strings.Split(stdout.String(), "\n")
|
||||||
if len(outputLines) == 0 {
|
if len(outputLines) == 0 {
|
||||||
return ExecInfo(""), nil
|
return ExecInfo(""), nil
|
||||||
|
|
3
main.go
3
main.go
|
@ -153,6 +153,9 @@ func main() {
|
||||||
mutex.Lock()
|
mutex.Lock()
|
||||||
var combinedOutput string
|
var combinedOutput string
|
||||||
for i, output := range moduleOutputs {
|
for i, output := range moduleOutputs {
|
||||||
|
if output == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if i > 0 {
|
if i > 0 {
|
||||||
combinedOutput += delim
|
combinedOutput += delim
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue