oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-09-15 18:57:01 +00:00
Code Wiki Activity

Capture errors from docker log output

Browse source 
- Refactored logDockerResponse function to remove extra if-else nesting
- logDockerResponse func now returns an error if error was detected from the log stream
- logDockerResponse will check for msg.ErrorDetail.Message and bail if there's an error
This commit is contained in:
Dan Sosedoff 2019-03-01 21:16:43 -06:00
parent b61c3f2f3f
commit fa888ff84c
2 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

49
container/docker_common.go
View file

@ -4,6 +4,7 @@ import (
"bufio"
"context"
"encoding/json"
"errors"
"fmt"
"io"
"os"
@ -64,42 +65,52 @@ func (i *DockerExecutorInput) writeLog(isError bool, format string, args ...inte
}
func (i *DockerExecutorInput) logDockerResponse(dockerResponse io.ReadCloser, isError bool) {
func (i *DockerExecutorInput) logDockerResponse(dockerResponse io.ReadCloser, isError bool) error {
if dockerResponse == nil {
return
return nil
}
defer dockerResponse.Close()
scanner := bufio.NewScanner(dockerResponse)
msg := dockerMessage{}
for scanner.Scan() {
line := scanner.Bytes()
msg.ID = ""
msg.Stream = ""
msg.Error = ""
msg.ErrorDetail.Message = ""
msg.Status = ""
msg.Progress = ""
if err := json.Unmarshal(line, &msg); err == nil {
if msg.Error != "" {
i.writeLog(isError, "%s", msg.Error)
return
}
if msg.Status != "" {
if msg.Progress != "" {
i.writeLog(isError, "%s :: %s :: %s\n", msg.Status, msg.ID, msg.Progress)
} else {
i.writeLog(isError, "%s :: %s\n", msg.Status, msg.ID)
}
} else if msg.Stream != "" {
i.writeLog(isError, msg.Stream)
} else {
i.writeLog(false, "Unable to handle line: %s", string(line))
}
} else {
if err := json.Unmarshal(line, &msg); err != nil {
i.writeLog(false, "Unable to unmarshal line [%s] ==> %v", string(line), err)
continue
}
if msg.Error != "" {
i.writeLog(isError, "%s", msg.Error)
return errors.New(msg.Error)
}
if msg.ErrorDetail.Message != "" {
i.writeLog(isError, "%s", msg.ErrorDetail.Message)
return errors.New(msg.Error)
}
if msg.Status != "" {
if msg.Progress != "" {
i.writeLog(isError, "%s :: %s :: %s\n", msg.Status, msg.ID, msg.Progress)
} else {
i.writeLog(isError, "%s :: %s\n", msg.Status, msg.ID)
}
} else if msg.Stream != "" {
i.writeLog(isError, msg.Stream)
} else {
i.writeLog(false, "Unable to handle line: %s", string(line))
}
}
return nil
}