From 1020402b34939ca69bab06a4a03f25cf9d370cdf Mon Sep 17 00:00:00 2001 From: Svarog Date: Wed, 25 Mar 2020 16:14:08 +0200 Subject: [PATCH] [NOD-869] Close panicHandlerDone instead of sending an empty struct + use time.After instead of time.Tick (#668) --- util/panics/panics.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/util/panics/panics.go b/util/panics/panics.go index ec1fd7bfc..4f04e2e75 100644 --- a/util/panics/panics.go +++ b/util/panics/panics.go @@ -2,10 +2,11 @@ package panics import ( "fmt" - "github.com/kaspanet/kaspad/logs" "os" "runtime/debug" "time" + + "github.com/kaspanet/kaspad/logs" ) // HandlePanic recovers panics, log them, runs an optional panicHandler, @@ -24,15 +25,16 @@ func HandlePanic(log *logs.Logger, goroutineStackTrace []byte) { } log.Criticalf("Stack trace: %s", debug.Stack()) log.Backend().Close() - panicHandlerDone <- struct{}{} + close(panicHandlerDone) }() const panicHandlerTimeout = 5 * time.Second select { - case <-time.Tick(panicHandlerTimeout): + case <-time.After(panicHandlerTimeout): fmt.Fprintln(os.Stderr, "Couldn't handle a fatal error. Exiting...") case <-panicHandlerDone: } + log.Criticalf("Exiting") os.Exit(1) }