Add blocking mode support

This commit is contained in:
jar3b 2019-04-09 17:50:55 +03:00
parent f8e923b600
commit a980f1f8d2
2 changed files with 16 additions and 4 deletions

View File

@ -10,5 +10,5 @@ waiter.AddCloseHandler(func() {
nacl.FinalizeStan() nacl.FinalizeStan()
}, false) }, false)
waiter.Wait() waiter.Wait(true)
``` ```

View File

@ -9,6 +9,7 @@ import (
) )
type Waiter struct { type Waiter struct {
blockingMode bool
waitGroup sync.WaitGroup waitGroup sync.WaitGroup
closeHandlers []*CloseHandler closeHandlers []*CloseHandler
} }
@ -53,12 +54,22 @@ func (w *Waiter) Halt(err error) {
} else { } else {
log.Info("Program was terminated gracefully.") log.Info("Program was terminated gracefully.")
} }
if !w.blockingMode {
if err != nil {
os.Exit(1)
} else {
os.Exit(0)
}
}
} }
func (w *Waiter) Wait() { func (w *Waiter) Wait(blockingMode bool) {
w.blockingMode = blockingMode
if blockingMode {
log.Info("Waiting...") log.Info("Waiting...")
w.waitGroup.Wait() w.waitGroup.Wait()
} }
}
func (w *Waiter) onSignal(sig os.Signal) { func (w *Waiter) onSignal(sig os.Signal) {
log.Infof("Received signal '%s'! Exiting...", sig.String()) log.Infof("Received signal '%s'! Exiting...", sig.String())
@ -67,6 +78,7 @@ func (w *Waiter) onSignal(sig os.Signal) {
func NewWaiter() *Waiter { func NewWaiter() *Waiter {
w := Waiter{ w := Waiter{
true,
sync.WaitGroup{}, sync.WaitGroup{},
make([]*CloseHandler, 0), make([]*CloseHandler, 0),
} }