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

Merge pull request #16284 from vrothberg/fix-16076

Browse Source 
notifyproxy: fix container watcher
This commit is contained in:
OpenShift Merge Robot
2022-10-25 08:33:52 -04:00
committed by GitHub
parent 86f7b99924 c4ebe9e2ad
commit 045a190c33
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/systemd/notifyproxy/notifyproxy.go
View File

@ -183,10 +183,11 @@ func (p *NotifyProxy) WaitAndClose() error {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
go func() { go func() {
for {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return return
default: case <-time.After(time.Second):
state, err := p.container.State() state, err := p.container.State()
if err != nil { if err != nil {
p.errorChan <- err p.errorChan <- err
@ -196,7 +197,7 @@ func (p *NotifyProxy) WaitAndClose() error {
p.errorChan <- fmt.Errorf("%w: %s", ErrNoReadyMessage, p.container.ID()) p.errorChan <- fmt.Errorf("%w: %s", ErrNoReadyMessage, p.container.ID())
return return
} }
time.Sleep(time.Second) }
} }
}() }()
} }