lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resources: Use Events() method instead of raw channel

Browse Source 
This makes things easier if we ever split resources out into separate
packages.
This commit is contained in:
James Shubin
2016-10-19 20:08:32 -04:00
parent 3831e9739c
commit 42ff9b803a
9 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/exec.go
View File

@@ -190,7 +190,7 @@ func (obj *ExecRes) Watch(processChan chan event.Event) error {
// error reading input? // error reading input?
return fmt.Errorf("Unknown %s[%s] error: %v", obj.Kind(), obj.GetName(), err) return fmt.Errorf("Unknown %s[%s] error: %v", obj.Kind(), obj.GetName(), err)
case event := <-obj.events: case event := <-obj.Events():
cuid.SetConverged(false) cuid.SetConverged(false)
if exit, send = obj.ReadEvent(&event); exit { if exit, send = obj.ReadEvent(&event); exit {
return nil // exit return nil // exit

2
resources/file.go
View File

@@ -191,7 +191,7 @@ func (obj *FileRes) Watch(processChan chan event.Event) error {
send = true send = true
dirty = true dirty = true
case event := <-obj.events: case event := <-obj.Events():
cuid.SetConverged(false) cuid.SetConverged(false)
if exit, send = obj.ReadEvent(&event); exit { if exit, send = obj.ReadEvent(&event); exit {
return nil // exit return nil // exit

2
resources/msg.go
View File

@@ -119,7 +119,7 @@ func (obj *MsgRes) Watch(processChan chan event.Event) error {
for { for {
obj.SetState(ResStateWatching) // reset obj.SetState(ResStateWatching) // reset
select { select {
case event := <-obj.events: case event := <-obj.Events():
cuid.SetConverged(false) cuid.SetConverged(false)
// we avoid sending events on unpause // we avoid sending events on unpause
if exit, send = obj.ReadEvent(&event); exit { if exit, send = obj.ReadEvent(&event); exit {

2
resources/noop.go
View File

@@ -83,7 +83,7 @@ func (obj *NoopRes) Watch(processChan chan event.Event) error {
for { for {
obj.SetState(ResStateWatching) // reset obj.SetState(ResStateWatching) // reset
select { select {
case event := <-obj.events: case event := <-obj.Events():
cuid.SetConverged(false) cuid.SetConverged(false)
// we avoid sending events on unpause // we avoid sending events on unpause
if exit, send = obj.ReadEvent(&event); exit { if exit, send = obj.ReadEvent(&event); exit {

2
resources/pkg.go
View File

@@ -167,7 +167,7 @@ func (obj *PkgRes) Watch(processChan chan event.Event) error {
send = true send = true
dirty = true dirty = true
case event := <-obj.events: case event := <-obj.Events():
cuid.SetConverged(false) cuid.SetConverged(false)
if exit, send = obj.ReadEvent(&event); exit { if exit, send = obj.ReadEvent(&event); exit {
return nil // exit return nil // exit

2
resources/resources.go
View File

@@ -303,7 +303,7 @@ func (obj *BaseRes) ReadEvent(ev *event.Event) (exit, poke bool) {
case event.EventPause: case event.EventPause:
// wait for next event to continue // wait for next event to continue
select { select {
case e := <-obj.events: case e := <-obj.Events():
e.ACK() e.ACK()
if e.Name == event.EventExit { if e.Name == event.EventExit {
return true, false return true, false

4
resources/svc.go
View File

@@ -168,7 +168,7 @@ func (obj *SvcRes) Watch(processChan chan event.Event) error {
// loop so that we can see the changed invalid signal // loop so that we can see the changed invalid signal
log.Printf("Svc[%v]->DaemonReload()", svc) log.Printf("Svc[%v]->DaemonReload()", svc)
case event := <-obj.events: case event := <-obj.Events():
cuid.SetConverged(false) cuid.SetConverged(false)
if exit, send = obj.ReadEvent(&event); exit { if exit, send = obj.ReadEvent(&event); exit {
return nil // exit return nil // exit
@@ -223,7 +223,7 @@ func (obj *SvcRes) Watch(processChan chan event.Event) error {
cuid.SetConverged(false) cuid.SetConverged(false)
return fmt.Errorf("Unknown %s[%s] error: %v", obj.Kind(), obj.GetName(), err) return fmt.Errorf("Unknown %s[%s] error: %v", obj.Kind(), obj.GetName(), err)
case event := <-obj.events: case event := <-obj.Events():
cuid.SetConverged(false) cuid.SetConverged(false)
if exit, send = obj.ReadEvent(&event); exit { if exit, send = obj.ReadEvent(&event); exit {
return nil // exit return nil // exit

3
resources/timer.go
View File

@@ -97,7 +97,8 @@ func (obj *TimerRes) Watch(processChan chan event.Event) error {
case <-ticker.C: // received the timer event case <-ticker.C: // received the timer event
send = true send = true
log.Printf("%v[%v]: received tick", obj.Kind(), obj.GetName()) log.Printf("%v[%v]: received tick", obj.Kind(), obj.GetName())
case event := <-obj.events:
case event := <-obj.Events():
cuid.SetConverged(false) cuid.SetConverged(false)
if exit, _ := obj.ReadEvent(&event); exit { if exit, _ := obj.ReadEvent(&event); exit {
return nil return nil

2
resources/virt.go
View File

@@ -217,7 +217,7 @@ func (obj *VirtRes) Watch(processChan chan event.Event) error {
cuid.SetConverged(false) cuid.SetConverged(false)
return fmt.Errorf("Unknown %s[%s] libvirt error: %s", obj.Kind(), obj.GetName(), err) 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) cuid.SetConverged(false)
if exit, send = obj.ReadEvent(&event); exit { if exit, send = obj.ReadEvent(&event); exit {
return nil // exit return nil // exit