mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-06-17 21:00:46 +00:00
Code Issues Projects Releases Wiki Activity

Wait to finish reading logs before calling Wait() on pipeline (#1010)

Browse source 
This fixes errors like the following and chopped off logs ...
This commit is contained in:
Florian Märkl 2022-07-31 17:12:15 +02:00 committed by GitHub
parent 5557674835
commit 7031904dbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pipeline/pipeline.go
View file

@ -3,6 +3,7 @@ package pipeline
import ( import (
"context" "context"
"strings" "strings"
"sync"
"time" "time"
"github.com/rs/zerolog" "github.com/rs/zerolog"
@ -216,13 +217,16 @@ func (r *Runtime) exec(step *backend.Step) (*backend.State, error) {
return nil, err return nil, err
} }
var wg sync.WaitGroup
if r.logger != nil { if r.logger != nil {
rc, err := r.engine.Tail(r.ctx, step) rc, err := r.engine.Tail(r.ctx, step)
if err != nil { if err != nil {
return nil, err return nil, err
} }
wg.Add(1)
go func() { go func() {
defer wg.Done()
logger := r.MakeLogger() logger := r.MakeLogger()
if err := r.logger.Log(step, multipart.New(rc)); err != nil { if err := r.logger.Log(step, multipart.New(rc)); err != nil {
@ -237,6 +241,9 @@ func (r *Runtime) exec(step *backend.Step) (*backend.State, error) {
return nil, nil return nil, nil
} }
// Some pipeline backends, such as local, will close the pipe from Tail on Wait,
// so first make sure all reading has finished.
wg.Wait()
waitState, err := r.engine.Wait(r.ctx, step) waitState, err := r.engine.Wait(r.ctx, step)
if err != nil { if err != nil {
return nil, err return nil, err