4 Commits

3 changed files with 12 additions and 11 deletions

View File

@@ -10,5 +10,6 @@ waiter.AddCloseHandler(func() {
nacl.FinalizeStan()
}, false)
waiter.Wait(true)
// blocking wait, if no need to block (with http server, for example), you can omit .Wait() call
waiter.Wait()
```

View File

@@ -2,7 +2,7 @@ package grawt
type CloseHandler struct {
waiter *Waiter
Quit chan bool
Quit chan struct{}
active bool
autoDone bool
handlerFunc *func()

View File

@@ -17,7 +17,7 @@ type Waiter struct {
func (w *Waiter) addHandler(f *func(), autoDone bool) *CloseHandler {
ch := CloseHandler{
w,
make(chan bool, 1),
make(chan struct{}, 1),
true,
autoDone,
f,
@@ -32,7 +32,9 @@ func (w *Waiter) terminateHandler(h *CloseHandler, forceWaitGroupDone bool) {
if h.handlerFunc != nil && *h.handlerFunc != nil {
(*h.handlerFunc)()
}
h.Quit <- true
if h.active {
close(h.Quit)
}
if h.autoDone || forceWaitGroupDone {
w.waitGroup.Done()
}
@@ -63,13 +65,11 @@ func (w *Waiter) Halt(err error) {
}
}
func (w *Waiter) Wait(blockingMode bool) {
w.blockingMode = blockingMode
if blockingMode {
func (w *Waiter) Wait() {
w.blockingMode = true
log.Info("Waiting...")
w.waitGroup.Wait()
}
}
func (w *Waiter) onSignal(sig os.Signal) {
log.Infof("Received signal '%s'! Exiting...", sig.String())
@@ -78,7 +78,7 @@ func (w *Waiter) onSignal(sig os.Signal) {
func NewWaiter() *Waiter {
w := Waiter{
true,
false,
sync.WaitGroup{},
make([]*CloseHandler, 0),
}