From e1643f8e1cc4e348fb69f1f44907088b5bf1f2ce Mon Sep 17 00:00:00 2001 From: Marcus Redivo Date: Tue, 4 Nov 2014 11:56:32 -0800 Subject: [PATCH] Remove signal.go logging; log from hook functions instead. --- graceful/signal.go | 4 +--- serve.go | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/graceful/signal.go b/graceful/signal.go index 5c2ab15..4d9f0ae 100644 --- a/graceful/signal.go +++ b/graceful/signal.go @@ -1,7 +1,6 @@ package graceful import ( - "log" "os" "os/signal" "sync" @@ -90,8 +89,7 @@ func PostHook(f func()) { } func waitForSignal() { - sig := <-sigchan - log.Printf("Received %v, gracefully shutting down!", sig) + <-sigchan hookLock.Lock() defer hookLock.Unlock() diff --git a/serve.go b/serve.go index 04c245b..cb4e405 100644 --- a/serve.go +++ b/serve.go @@ -34,6 +34,8 @@ func Serve() { graceful.HandleSignals() bind.Ready() + graceful.PreHook(func() { log.Printf("Goji received signal, gracefully stopping") }) + graceful.PostHook(func() { log.Printf("Goji stopped") }) err := graceful.Serve(listener, http.DefaultServeMux)