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

[FIX] Fix not enough arguments problem

Browse Source
This commit is contained in:
bay1ts 2017-12-04 18:12:48 +08:00
parent 8b26744a31
commit 0451566159
2 changed files with 43 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/grctl/cmd/init.go
View File

@ -86,14 +86,14 @@ func NewCmdInstallStatus() cli.Command {
for _,v:=range tasks {
for _,vs:=range v.Status{
if vs.Status=="start"||vs.Status=="create"{
Status(v.ID,nil)
Status(v.ID)
return nil
}
}
}
}else {
Status(taskID,nil)
Status(taskID)
}
return nil
},

89
pkg/grctl/cmd/installStatus.go
View File

@ -193,7 +193,7 @@ func NewCmdInstall() cli.Command {
// return c
//}
func Status(task string,nodes []string) {
func Status(task string) {
taskE:=clients.NodeClient.Tasks().Get(task)
lastState:=""
checkFail:=0
@ -208,54 +208,47 @@ func Status(task string,nodes []string) {
}
continue
}
for k,v:=range status.Status{
for _,nid:=range nodes {
if k==nid {
if strings.Contains(v.Status, "error")||strings.Contains(v.CompleStatus,"Failure")||strings.Contains(v.CompleStatus,"Unknow") {
checkFail+=1
fmt.Errorf("error executing task %s",task)
taskE:=clients.NodeClient.Tasks().Get(task)
for _,v:=range taskE.Task.OutPut{
fmt.Printf("on %s :\n %s",v.NodeID,v.Body)
}
os.Exit(1)
}
if v.Status!="complete"&&v.CompleStatus!="Success" {
if lastState!=v.Status{
fmt.Printf("task %s is %s\n",task,v.Status)
}else{
fmt.Print("..")
}
lastState=v.Status
}else {
fmt.Printf("task %s is %s %s\n",task,v.Status,v.CompleStatus)
lastState=v.Status
taskFinished:=clients.NodeClient.Tasks().Get(task)
var nextTasks []string
for _,v:=range taskFinished.Task.OutPut{
for _,sv:=range v.Status{
if sv.NextTask == nil ||len(sv.NextTask)==0{
continue
}else{
for _,v:=range sv.NextTask{
nextTasks=append(nextTasks,v)
}
}
}
}
if len(nextTasks) > 0 {
fmt.Printf("next will install %v \n",nextTasks)
for _,v:=range nextTasks{
Status(v,nodes)
}
}
return
}
for _,v:=range status.Status{
if strings.Contains(v.Status, "error")||strings.Contains(v.CompleStatus,"Failure")||strings.Contains(v.CompleStatus,"Unknow") {
checkFail+=1
fmt.Errorf("error executing task %s",task)
taskE:=clients.NodeClient.Tasks().Get(task)
for _,v:=range taskE.Task.OutPut{
fmt.Printf("on %s :\n %s",v.NodeID,v.Body)
}
os.Exit(1)
}
if v.Status!="complete"&&v.CompleStatus!="Success" {
if lastState!=v.Status{
fmt.Printf("task %s is %s\n",task,v.Status)
}else{
fmt.Print("..")
}
lastState=v.Status
}else {
fmt.Printf("task %s is %s %s\n",task,v.Status,v.CompleStatus)
lastState=v.Status
taskFinished:=clients.NodeClient.Tasks().Get(task)
var nextTasks []string
for _,v:=range taskFinished.Task.OutPut{
for _,sv:=range v.Status{
if sv.NextTask == nil ||len(sv.NextTask)==0{
continue
}else{
for _,v:=range sv.NextTask{
nextTasks=append(nextTasks,v)
}
}
}
}
if len(nextTasks) > 0 {
fmt.Printf("next will install %v \n",nextTasks)
for _,v:=range nextTasks{
Status(v)
}
}
return
}
}
checkFail=0
}
@ -274,7 +267,7 @@ func Task(c *cli.Context,task string,status bool) error {
logrus.Errorf("error exec task:%s,details %s",task,err.Error())
return err
}
Status(task,nodes)
Status(task)
return nil
}