Merge pull request #2230 from kevinmeredith/add-non-fatal-error-handler

Add NonFatalServiceErrorHandler.
http4s · Nov 1, 2018 · de408dd · de408dd
2 parents 4b026dd + f85ce1d
commit de408dd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/server/src/main/scala/org/http4s/server/package.scala b/server/src/main/scala/org/http4s/server/package.scala
@@ -8,6 +8,7 @@ import org.http4s.headers.{Connection, `Content-Length`}
 import org.http4s.syntax.string._
 import org.log4s.getLogger
 import scala.concurrent.duration._
+import scala.util.control.NonFatal
 
 package object server {
 
@@ -108,7 +109,7 @@ package object server {
         s"""Message failure handling request: ${req.method} ${req.pathInfo} from ${req.remoteAddr
           .getOrElse("<unknown>")}""")
       mf.toHttpResponse(req.httpVersion)
-    case t if !t.isInstanceOf[VirtualMachineError] =>
+    case NonFatal(t) =>
       serviceErrorLogger.error(t)(
         s"""Error servicing request: ${req.method} ${req.pathInfo} from ${req.remoteAddr.getOrElse(
           "<unknown>")}""")