Merge pull request #4147 from influxdb/httpd-recovery

Missing defer in httpd recovery.  fixes #4124

CHANGELOG.md

@@ -9,6 +9,7 @@
 - [#3457](https://github.com/influxdb/influxdb/issues/3457): [0.9.3] cannot select field names with prefix + "." that match the measurement name
 - [#4111](https://github.com/influxdb/influxdb/pull/4111): Update pre-commit hook for go vet composites
 - [#4136](https://github.com/influxdb/influxdb/pull/4136): Return an error-on-write if target retention policy does not exist. Thanks for the report @ymettier
+- [#4124](https://github.com/influxdb/influxdb/issues/4124): Missing defer/recover/panic idiom in HTTPD service
 
 ## v0.9.4 [2015-09-14]
 

services/httpd/handler.go

@@ -801,12 +801,16 @@ func recovery(inner http.Handler, name string, weblog *log.Logger) http.Handler
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		start := time.Now()
 		l := &responseLogger{w: w}
+
+		defer func() {
+			if err := recover(); err != nil {
+				logLine := buildLogLine(l, r, start)
+				logLine = fmt.Sprintf(`%s [panic:%s]`, logLine, err)
+				weblog.Println(logLine)
+			}
+		}()
+
 		inner.ServeHTTP(l, r)
-		if err := recover(); err != nil {
-			logLine := buildLogLine(l, r, start)
-			logLine = fmt.Sprintf(`%s [err:%s]`, logLine, err)
-			weblog.Println(logLine)
-		}
 	})
 }