mirrors/dozzle
1
0
Fork 0
mirror of https://github.com/amir20/dozzle.git synced 2026-01-02 19:17:37 +01:00
Code Issues Projects Releases Wiki Activity

Fixes messages possible deadlock

Browse Source
This commit is contained in:
Amir Raminfar
2018-12-05 06:57:37 -08:00
parent 00615f5ffa
commit 952c38e7b3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docker/client.go
View File

@@ -84,12 +84,12 @@ func (d *dockerClient) ContainerLogs(ctx context.Context, id string) (<-chan str
return nil, errChannel
}
messages := make(chan string)
go func() {
<-ctx.Done()
reader.Close()
}()
messages := make(chan string)
go func() {
defer close(messages)
defer close(errChannel)
@@ -109,7 +109,10 @@ func (d *dockerClient) ContainerLogs(ctx context.Context, id string) (<-chan str
errChannel <- err
break
}
messages <- buffer.String()
select {
case messages <- buffer.String():
case <-ctx.Done():
}
buffer.Reset()
}
}()