p/acid
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deployment error processing

Browse Source
This commit is contained in:
Přemysl Eric Janouch 2024-12-26 16:18:37 +01:00
parent d5981249b1
commit 55a6693942
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
acid.go
View File

@ -1317,19 +1317,20 @@ func executorRunTask(ctx context.Context, task Task) error {
defer client.Close() defer client.Close()
var ( var (
ee1 *ssh.ExitError eeSSH *ssh.ExitError
ee2 *executorError eeExec *exec.ExitError
ee3 *executorError
) )
err = executorBuild(ctxRunner, client, rt) err = executorBuild(ctxRunner, client, rt)
if err != nil { if err != nil {
locked(func() { locked(func() {
if errors.As(err, &ee1) { if errors.As(err, &eeSSH) {
rt.DB.State, rt.DB.Detail = taskStateFailed, "Scripts failed" rt.DB.State, rt.DB.Detail = taskStateFailed, "Scripts failed"
fmt.Fprintf(&rt.TaskLog, "\n%s\n", err) fmt.Fprintf(&rt.TaskLog, "\n%s\n", err)
} else if errors.As(err, &ee2) { } else if errors.As(err, &ee3) {
rt.DB.State, rt.DB.Detail = taskStateError, ee2.Detail rt.DB.State, rt.DB.Detail = taskStateError, ee3.Detail
fmt.Fprintf(&rt.TaskLog, "\n%s\n", ee2.Err) fmt.Fprintf(&rt.TaskLog, "\n%s\n", ee3.Err)
} else { } else {
rt.DB.State, rt.DB.Detail = taskStateError, "" rt.DB.State, rt.DB.Detail = taskStateError, ""
fmt.Fprintf(&rt.TaskLog, "\n%s\n", err) fmt.Fprintf(&rt.TaskLog, "\n%s\n", err)
@ -1349,12 +1350,12 @@ func executorRunTask(ctx context.Context, task Task) error {
locked(func() { locked(func() {
if err == nil { if err == nil {
rt.DB.State, rt.DB.Detail = taskStateSuccess, "" rt.DB.State, rt.DB.Detail = taskStateSuccess, ""
} else if errors.As(err, &ee1) { } else if errors.As(err, &eeExec) {
rt.DB.State, rt.DB.Detail = taskStateFailed, "Deployment failed" rt.DB.State, rt.DB.Detail = taskStateFailed, "Deployment failed"
fmt.Fprintf(&rt.DeployLog, "\n%s\n", err) fmt.Fprintf(&rt.DeployLog, "\n%s\n", err)
} else if errors.As(err, &ee2) { } else if errors.As(err, &ee3) {
rt.DB.State, rt.DB.Detail = taskStateError, ee2.Detail rt.DB.State, rt.DB.Detail = taskStateError, ee3.Detail
fmt.Fprintf(&rt.DeployLog, "\n%s\n", ee2.Err) fmt.Fprintf(&rt.DeployLog, "\n%s\n", ee3.Err)
} else { } else {
rt.DB.State, rt.DB.Detail = taskStateError, "" rt.DB.State, rt.DB.Detail = taskStateError, ""
fmt.Fprintf(&rt.DeployLog, "\n%s\n", err) fmt.Fprintf(&rt.DeployLog, "\n%s\n", err)