oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-11 17:50:58 +00:00
Code Wiki Activity

improve linting

Browse source
This commit is contained in:
Casey Lee 2019-01-15 17:41:02 -08:00
parent c9c2a3d905
commit d2c440bf4f
7 changed files with 136 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

19
container/docker_common.go
View file

@ -29,18 +29,17 @@ type dockerMessage struct {
Progress string `json:"progress"`
}
func (i *DockerExecutorInput) logDockerOutput(dockerResponse io.Reader) error {
func (i *DockerExecutorInput) logDockerOutput(dockerResponse io.Reader) {
scanner := bufio.NewScanner(dockerResponse)
if i.Logger == nil {
return nil
return
}
for scanner.Scan() {
i.Logger.Infof(scanner.Text())
}
return nil
}
func (i *DockerExecutorInput) streamDockerOutput(dockerResponse io.Reader) error {
func (i *DockerExecutorInput) streamDockerOutput(dockerResponse io.Reader) {
out := os.Stdout
go func() {
<-i.Ctx.Done()
@ -48,7 +47,9 @@ func (i *DockerExecutorInput) streamDockerOutput(dockerResponse io.Reader) error
}()
_, err := io.Copy(out, dockerResponse)
return err
if err != nil {
i.Logger.Error(err)
}
}
func (i *DockerExecutorInput) writeLog(isError bool, format string, args ...interface{}) {
@ -63,9 +64,9 @@ func (i *DockerExecutorInput) writeLog(isError bool, format string, args ...inte
}
func (i *DockerExecutorInput) logDockerResponse(dockerResponse io.ReadCloser, isError bool) error {
func (i *DockerExecutorInput) logDockerResponse(dockerResponse io.ReadCloser, isError bool) {
if dockerResponse == nil {
return nil
return
}
defer dockerResponse.Close()
@ -81,7 +82,8 @@ func (i *DockerExecutorInput) logDockerResponse(dockerResponse io.ReadCloser, is
msg.Progress = ""
if err := json.Unmarshal(line, &msg); err == nil {
if msg.Error != "" {
return fmt.Errorf("%s", msg.Error)
i.writeLog(isError, "%s", msg.Error)
return
}
if msg.Status != "" {
@ -100,5 +102,4 @@ func (i *DockerExecutorInput) logDockerResponse(dockerResponse io.ReadCloser, is
}
}
return nil
}