From ac0f979ef91a45277a1713908d67c7b14699eec0 Mon Sep 17 00:00:00 2001 From: jar3b Date: Tue, 9 Apr 2019 17:55:36 +0300 Subject: [PATCH] Rework blocking logic, up to 0.1.2 --- README.md | 3 ++- waiter.go | 12 +++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b70478a..44465a9 100644 --- a/README.md +++ b/README.md @@ -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() ``` \ No newline at end of file diff --git a/waiter.go b/waiter.go index d1e5026..85d5d12 100644 --- a/waiter.go +++ b/waiter.go @@ -63,12 +63,10 @@ func (w *Waiter) Halt(err error) { } } -func (w *Waiter) Wait(blockingMode bool) { - w.blockingMode = blockingMode - if blockingMode { - log.Info("Waiting...") - w.waitGroup.Wait() - } +func (w *Waiter) Wait() { + w.blockingMode = true + log.Info("Waiting...") + w.waitGroup.Wait() } func (w *Waiter) onSignal(sig os.Signal) { @@ -78,7 +76,7 @@ func (w *Waiter) onSignal(sig os.Signal) { func NewWaiter() *Waiter { w := Waiter{ - true, + false, sync.WaitGroup{}, make([]*CloseHandler, 0), }