Merge pull request #584 from xiekeyang/panic

Panic: Add Handler
This commit is contained in:
Stephen Day 2015-06-11 11:01:43 -07:00
commit fc796f1722

View File

@ -61,6 +61,7 @@ func main() {
app := handlers.NewApp(ctx, *config) app := handlers.NewApp(ctx, *config)
handler := configureReporting(app) handler := configureReporting(app)
handler = panicHandler(handler)
handler = gorhandlers.CombinedLoggingHandler(os.Stdout, handler) handler = gorhandlers.CombinedLoggingHandler(os.Stdout, handler)
if config.HTTP.Debug.Addr != "" { if config.HTTP.Debug.Addr != "" {
@ -272,3 +273,17 @@ func debugServer(addr string) {
log.Fatalf("error listening on debug interface: %v", err) log.Fatalf("error listening on debug interface: %v", err)
} }
} }
// panicHandler add a HTTP handler to web app. The handler recover the happening
// panic. logrus.Panic transmits panic message to pre-config log hooks, which is
// defined in config.yml.
func panicHandler(handler http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
defer func() {
if err := recover(); err != nil {
log.Panic(fmt.Sprintf("%v", err))
}
}()
handler.ServeHTTP(w, r)
})
}