opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 03:19:52 +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

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

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