opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 12:12:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23170 from Luap99/events

Browse Source 
podman events: fix error race
This commit is contained in:
openshift-merge-bot[bot]
2024-07-05 07:02:47 +00:00
committed by GitHub
parent 0358325f9b d00e68e550
commit 46840fa854
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/podman/system/events.go
View File

@ -163,6 +163,7 @@ func eventsCmd(cmd *cobra.Command, _ []string) error {
go func() { go func() {
errChannel <- registry.ContainerEngine().Events(context.Background(), eventOptions) errChannel <- registry.ContainerEngine().Events(context.Background(), eventOptions)
close(errChannel)
}() }()
for { for {
@ -170,14 +171,8 @@ func eventsCmd(cmd *cobra.Command, _ []string) error {
case event, ok := <-eventChannel: case event, ok := <-eventChannel:
if !ok { if !ok {
// channel was closed we can exit // channel was closed we can exit
select { // read the error channel blocking to make sure we are not missing any errors (#23165)
case err := <-errChannel: return <-errChannel
if err != nil {
return err
}
default:
}
return nil
} }
switch { switch {
case doJSON: case doJSON: