Merge pull request #138 from cloudflare/brendan/no-crash

Catch panics, like net/http.Server.
cloudflare · Sep 19, 2016 · 0fb7279 · 0fb7279
2 parents 0728b45 + fc583f2
commit 0fb7279
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/server/server.go b/server/server.go
@@ -199,6 +199,12 @@ func (s *Server) handle(conn *gokeyless.Conn) {
 
 func (s *Server) handleReq(conn *gokeyless.Conn, ch chan *gokeyless.Header) {
 	runtime.LockOSThread()
+	defer func() {
+		if err := recover(); err != nil {
+			log.Errorf("panic while handling request: %v", err)
+			go s.handleReq(conn, ch)
+		}
+	}()
 
 	var connError error
 	for connError == nil {