Browse Source

Merge pull request #77 from mredivo/no-log-signal2

Remove signal.go logging; log from hook functions instead.
Carl Jackson 11 years ago
parent
commit
709dbfa7bd
2 changed files with 3 additions and 3 deletions
  1. +1
    -3
      graceful/signal.go
  2. +2
    -0
      serve.go

+ 1
- 3
graceful/signal.go View File

@ -1,7 +1,6 @@
package graceful package graceful
import ( import (
"log"
"os" "os"
"os/signal" "os/signal"
"sync" "sync"
@ -90,8 +89,7 @@ func PostHook(f func()) {
} }
func waitForSignal() { func waitForSignal() {
sig := <-sigchan
log.Printf("Received %v, gracefully shutting down!", sig)
<-sigchan
hookLock.Lock() hookLock.Lock()
defer hookLock.Unlock() defer hookLock.Unlock()


+ 2
- 0
serve.go View File

@ -34,6 +34,8 @@ func Serve() {
graceful.HandleSignals() graceful.HandleSignals()
bind.Ready() 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) err := graceful.Serve(listener, http.DefaultServeMux)


Loading…
Cancel
Save