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

recwatch: Unblock from sending on exit

Browse Source 
If we receive an exit signal while we are waiting to send a message, we
should still be able to shut down.
This commit is contained in:
James Shubin
2017-02-22 16:29:01 -05:00
parent 2a8606bd98
commit c189278e24
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
recwatch/recwatch.go
View File

@@ -95,7 +95,11 @@ func (obj *RecWatcher) Init() error {
// immediately, this can send after closed which panics! // immediately, this can send after closed which panics!
obj.mutex.Lock() obj.mutex.Lock()
if !obj.closed { if !obj.closed {
obj.events <- Event{Error: err} select {
case obj.events <- Event{Error: err}:
case <-obj.exit:
// pass
}
} }
obj.mutex.Unlock() obj.mutex.Unlock()
} }
@@ -119,10 +123,6 @@ func (obj *RecWatcher) Close() error {
if obj.watcher != nil { if obj.watcher != nil {
err = obj.watcher.Close() err = obj.watcher.Close()
obj.watcher = nil obj.watcher = nil
// TODO: should we send the close error?
//if err != nil {
// obj.events <- Event{Error: err}
//}
} }
obj.mutex.Lock() // FIXME: I don't think this mutex is needed anymore... obj.mutex.Lock() // FIXME: I don't think this mutex is needed anymore...
obj.closed = true obj.closed = true
@@ -280,7 +280,12 @@ func (obj *RecWatcher) Watch() error {
if send { if send {
send = false send = false
// only invalid state on certain types of events // only invalid state on certain types of events
obj.events <- Event{Error: nil, Body: &event} select {
// exit even when we're blocked on event sending
case obj.events <- Event{Error: nil, Body: &event}:
case <-obj.exit:
return fmt.Errorf("pending event not sent")
}
} }
case err := <-obj.watcher.Errors: case err := <-obj.watcher.Errors: