Skip to content

Commit 5497b15

Browse files
committed
Fix error when closing logs (woodpecker-ci#2637)
Previously, *all* log streams of the pipeline were closed everytime when a workflow is done, if you have multiple workflows, streams will be closed multiple times. Closes woodpecker-ci#2036
1 parent 948a5b3 commit 5497b15

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

server/grpc/rpc.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -290,11 +290,9 @@ func (s *RPC) Done(c context.Context, id string, state rpc.State) error {
290290

291291
// make sure writes to pubsub are non blocking (https://github.com/woodpecker-ci/woodpecker/blob/c919f32e0b6432a95e1a6d3d0ad662f591adf73f/server/logging/log.go#L9)
292292
go func() {
293-
for _, wf := range currentPipeline.Workflows {
294-
for _, step := range wf.Children {
295-
if err := s.logger.Close(c, step.ID); err != nil {
296-
logger.Error().Err(err).Msgf("done: cannot close log stream for step %d", step.ID)
297-
}
293+
for _, step := range workflow.Children {
294+
if err := s.logger.Close(c, step.ID); err != nil {
295+
logger.Error().Err(err).Msgf("done: cannot close log stream for step %d", step.ID)
298296
}
299297
}
300298
}()

0 commit comments

Comments
 (0)