engine: resources: Fix a possible panic on closed channel
I don't know how often it happens, but we should catch it.
This commit is contained in:
@@ -148,7 +148,10 @@ func (obj *PkgRes) Watch() error {
|
|||||||
send = true
|
send = true
|
||||||
obj.init.Dirty() // dirty
|
obj.init.Dirty() // dirty
|
||||||
|
|
||||||
case event := <-obj.init.Events:
|
case event, ok := <-obj.init.Events:
|
||||||
|
if !ok {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
if err := obj.init.Read(event); err != nil {
|
if err := obj.init.Read(event); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -176,7 +176,10 @@ func (obj *SvcRes) Watch() error {
|
|||||||
// loop so that we can see the changed invalid signal
|
// loop so that we can see the changed invalid signal
|
||||||
obj.init.Logf("daemon reload")
|
obj.init.Logf("daemon reload")
|
||||||
|
|
||||||
case event := <-obj.init.Events:
|
case event, ok := <-obj.init.Events:
|
||||||
|
if !ok {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
if err := obj.init.Read(event); err != nil {
|
if err := obj.init.Read(event); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -222,7 +225,10 @@ func (obj *SvcRes) Watch() error {
|
|||||||
case err := <-subErrors:
|
case err := <-subErrors:
|
||||||
return errwrap.Wrapf(err, "unknown %s error", obj)
|
return errwrap.Wrapf(err, "unknown %s error", obj)
|
||||||
|
|
||||||
case event := <-obj.init.Events:
|
case event, ok := <-obj.init.Events:
|
||||||
|
if !ok {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
if err := obj.init.Read(event); err != nil {
|
if err := obj.init.Read(event); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user