2 Commits

Author SHA1 Message Date
jar3b
ac0f979ef9 Rework blocking logic, up to 0.1.2 2019-04-09 17:55:36 +03:00
jar3b
a980f1f8d2 Add blocking mode support 2019-04-09 17:50:55 +03:00
2 changed files with 11 additions and 0 deletions

View File

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

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,9 +54,17 @@ 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() {
w.blockingMode = true
log.Info("Waiting...") log.Info("Waiting...")
w.waitGroup.Wait() w.waitGroup.Wait()
} }
@@ -67,6 +76,7 @@ func (w *Waiter) onSignal(sig os.Signal) {
func NewWaiter() *Waiter { func NewWaiter() *Waiter {
w := Waiter{ w := Waiter{
false,
sync.WaitGroup{}, sync.WaitGroup{},
make([]*CloseHandler, 0), make([]*CloseHandler, 0),
} }