htwkmooc/poseidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catch the "Close normal" error

Browse Source
This commit is contained in:
Maximilian Paß
2021-12-08 12:51:25 +01:00
parent e95e07e426
commit af939b7810
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/nomad/nomad.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"github.com/gorilla/websocket"
nomadApi "github.com/hashicorp/nomad/api" nomadApi "github.com/hashicorp/nomad/api"
"github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs"
"github.com/openHPI/poseidon/internal/config" "github.com/openHPI/poseidon/internal/config"
@ -352,7 +353,10 @@ func (a *APIClient) ExecuteCommand(allocationID string,
return a.executeCommandInteractivelyWithStderr(allocationID, ctx, command, stdin, stdout, stderr) return a.executeCommandInteractivelyWithStderr(allocationID, ctx, command, stdin, stdout, stderr)
} }
exitCode, err := a.apiQuerier.Execute(allocationID, ctx, command, tty, stdin, stdout, stderr) exitCode, err := a.apiQuerier.Execute(allocationID, ctx, command, tty, stdin, stdout, stderr)
if err != nil { if err != nil && websocket.IsCloseError(err, websocket.CloseNormalClosure) {
log.WithError(err).Info("The exit code could not be received.")
return 0, nil
} else if err != nil {
return 1, fmt.Errorf("error executing command in API: %w", err) return 1, fmt.Errorf("error executing command in API: %w", err)
} }
return exitCode, nil return exitCode, nil