diff --git a/resources/exec.go b/resources/exec.go index 1037f916..75a8b400 100644 --- a/resources/exec.go +++ b/resources/exec.go @@ -190,7 +190,7 @@ func (obj *ExecRes) Watch(processChan chan event.Event) error { // error reading input? return fmt.Errorf("Unknown %s[%s] error: %v", obj.Kind(), obj.GetName(), err) - case event := <-obj.events: + case event := <-obj.Events(): cuid.SetConverged(false) if exit, send = obj.ReadEvent(&event); exit { return nil // exit diff --git a/resources/file.go b/resources/file.go index 44c9c7bb..0af51e86 100644 --- a/resources/file.go +++ b/resources/file.go @@ -191,7 +191,7 @@ func (obj *FileRes) Watch(processChan chan event.Event) error { send = true dirty = true - case event := <-obj.events: + case event := <-obj.Events(): cuid.SetConverged(false) if exit, send = obj.ReadEvent(&event); exit { return nil // exit diff --git a/resources/msg.go b/resources/msg.go index 1fd393a2..af5318dc 100644 --- a/resources/msg.go +++ b/resources/msg.go @@ -119,7 +119,7 @@ func (obj *MsgRes) Watch(processChan chan event.Event) error { for { obj.SetState(ResStateWatching) // reset select { - case event := <-obj.events: + case event := <-obj.Events(): cuid.SetConverged(false) // we avoid sending events on unpause if exit, send = obj.ReadEvent(&event); exit { diff --git a/resources/noop.go b/resources/noop.go index 383a0e71..51f70a1d 100644 --- a/resources/noop.go +++ b/resources/noop.go @@ -83,7 +83,7 @@ func (obj *NoopRes) Watch(processChan chan event.Event) error { for { obj.SetState(ResStateWatching) // reset select { - case event := <-obj.events: + case event := <-obj.Events(): cuid.SetConverged(false) // we avoid sending events on unpause if exit, send = obj.ReadEvent(&event); exit { diff --git a/resources/pkg.go b/resources/pkg.go index f092f492..db9607f0 100644 --- a/resources/pkg.go +++ b/resources/pkg.go @@ -167,7 +167,7 @@ func (obj *PkgRes) Watch(processChan chan event.Event) error { send = true dirty = true - case event := <-obj.events: + case event := <-obj.Events(): cuid.SetConverged(false) if exit, send = obj.ReadEvent(&event); exit { return nil // exit diff --git a/resources/resources.go b/resources/resources.go index b127471f..dc5a73dc 100644 --- a/resources/resources.go +++ b/resources/resources.go @@ -303,7 +303,7 @@ func (obj *BaseRes) ReadEvent(ev *event.Event) (exit, poke bool) { case event.EventPause: // wait for next event to continue select { - case e := <-obj.events: + case e := <-obj.Events(): e.ACK() if e.Name == event.EventExit { return true, false diff --git a/resources/svc.go b/resources/svc.go index 46079a73..4ccfc5a9 100644 --- a/resources/svc.go +++ b/resources/svc.go @@ -168,7 +168,7 @@ func (obj *SvcRes) Watch(processChan chan event.Event) error { // loop so that we can see the changed invalid signal log.Printf("Svc[%v]->DaemonReload()", svc) - case event := <-obj.events: + case event := <-obj.Events(): cuid.SetConverged(false) if exit, send = obj.ReadEvent(&event); exit { return nil // exit @@ -223,7 +223,7 @@ func (obj *SvcRes) Watch(processChan chan event.Event) error { cuid.SetConverged(false) return fmt.Errorf("Unknown %s[%s] error: %v", obj.Kind(), obj.GetName(), err) - case event := <-obj.events: + case event := <-obj.Events(): cuid.SetConverged(false) if exit, send = obj.ReadEvent(&event); exit { return nil // exit diff --git a/resources/timer.go b/resources/timer.go index 071b3c02..8852212c 100644 --- a/resources/timer.go +++ b/resources/timer.go @@ -97,7 +97,8 @@ func (obj *TimerRes) Watch(processChan chan event.Event) error { case <-ticker.C: // received the timer event send = true log.Printf("%v[%v]: received tick", obj.Kind(), obj.GetName()) - case event := <-obj.events: + + case event := <-obj.Events(): cuid.SetConverged(false) if exit, _ := obj.ReadEvent(&event); exit { return nil diff --git a/resources/virt.go b/resources/virt.go index 39b8c9c4..a8c7c3c3 100644 --- a/resources/virt.go +++ b/resources/virt.go @@ -217,7 +217,7 @@ func (obj *VirtRes) Watch(processChan chan event.Event) error { cuid.SetConverged(false) return fmt.Errorf("Unknown %s[%s] libvirt error: %s", obj.Kind(), obj.GetName(), err) - case event := <-obj.events: + case event := <-obj.Events(): cuid.SetConverged(false) if exit, send = obj.ReadEvent(&event); exit { return nil // exit