test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-30 02:38:17 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[REV] Return detailed error output

Browse Source
This commit is contained in:
zhoujunhao 2018-08-24 12:32:04 +08:00
parent 74db753471
commit 576a45c83c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
node/core/service/node_service.go
View File

@ -35,6 +35,8 @@ import (
"github.com/twinj/uuid"
"os/exec"
"os"
"bytes"
"strings"
)
const (
@ -75,7 +77,7 @@ func (n *NodeService) AddNode(node *client.APIHostNode) *utils.APIHandleError {
if node.InternalIP == "" {
return utils.CreateAPIHandleError(400, fmt.Errorf("node internal ip can not be empty"))
}
if node.HostName == ""{
if node.HostName == "" {
return utils.CreateAPIHandleError(400, fmt.Errorf("node hostname can not be empty"))
}
@ -101,10 +103,15 @@ func (n *NodeService) AddNode(node *client.APIHostNode) *utils.APIHandleError {
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout
cmd.Stderr = &stderr
err := cmd.Run()
if err != nil {
logrus.Error(err)
return utils.CreateAPIHandleError(400, err)
errStr := string(stderr.Bytes())
logrus.Error(strings.TrimSpace(errStr))
return utils.CreateAPIHandleError(400, fmt.Errorf(strings.TrimSpace(errStr)))
}
logrus.Info("Add node successful, next you can:")