zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ Agent ] [ Executor ] - fix bugs

Browse Source
This commit is contained in:
zeaslity
2023-10-24 11:41:46 +08:00
parent 4afb62f7cf
commit 1224dd8def
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
agent-go/executor/CommandExecutor.go
View File

@@ -29,15 +29,26 @@ func Execute(em *ExecutionMessage) ([]string, error) {
var resultLog []string
var err error
var realCommand [][]string
ok := true
if strings.HasPrefix(em.Type, "BASE") {
// base function
resultLog = AgentOsOperatorCache.Command(em.FuncContent[0], em.FuncContent[1:]...)
err = nil
if len(em.FuncContent) > 1 {
ok, resultLog = AgentOsOperatorCache.Exec(em.FuncContent[0], em.FuncContent[1:]...)
} else {
ok, resultLog = AgentOsOperatorCache.Exec(em.FuncContent[0])
}
if ok {
return resultLog, nil
}
} else if strings.HasPrefix(em.Type, "APP") {
// app function
ok, resultLog := AgentOsOperatorCache.Deploy(em.FuncContent[0], em.FuncContent[1:]...)
if len(em.FuncContent) > 1 {
ok, resultLog = AgentOsOperatorCache.Deploy(em.FuncContent[0], em.FuncContent[1:]...)
} else {
ok, resultLog = AgentOsOperatorCache.Deploy(em.FuncContent[0])
}
if ok {
return resultLog, nil
} else {