fix error.clj API changes

factorhouse · Jan 17, 2025 · 3b485e0 · 3b485e0
1 parent 1069a4f
commit 3b485e0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/slipway-jetty12/src/slipway/error.clj b/slipway-jetty12/src/slipway/error.clj
@@ -1,18 +1,18 @@
 (ns slipway.error
   (:require [clojure.tools.logging :as log])
   (:import (java.io Writer)
+           (java.nio.charset Charset)
            (org.eclipse.jetty.server Request)
            (org.eclipse.jetty.server.handler ErrorHandler)))
 
 (defn log-error
-  [^Request request code message]
-  (if-let [ex nil                                           ; TODO: where now? (.getAttribute request RequestDispatcher/ERROR_EXCEPTION)
-           ]
-    (log/errorf ex "server error: %s %s" code message)
+  [^Request code message cause]
+  (if cause
+    (log/errorf cause "server error: %s %s" code message)
     (log/errorf "server error: %s %s" code message)))
 
 (defn handler ^ErrorHandler
   [body-fn]
   (proxy [ErrorHandler] []
-    (writeErrorHtml [^Request request ^Writer writer code ^String message showStacks]
-      (.write writer ^String (body-fn request code message showStacks)))))
+    (writeErrorHtml [^Request request ^Writer writer ^Charset charset code ^String message ^Throwable cause show-stacks]
+      (.write writer ^String (body-fn request charset code message cause show-stacks)))))
diff --git a/slipway-jetty12/test/slipway/example/app.clj b/slipway-jetty12/test/slipway/example/app.clj
@@ -69,8 +69,8 @@
   (throw (RuntimeException. "Error Route")))
 
 (defn server-error-body-fn
-  [request code message _]
-  (error/log-error request code message)
+  [_request _charset code message cause _show-stacks]
+  (error/log-error code message cause)
   (html/error-page code "Server Error" message))
 
 (def server-error-handler (error/handler server-error-body-fn))
@@ -110,10 +110,10 @@
                                            "http://localhost:3443"}}
         session-config {:store (ring.session.memory/memory-store)}]
     (-> (reitit/ring-handler
-         (reitit/router (routes (sente/start-server sente-config)))
-         (reitit/routes
-          (reitit/create-resource-handler {:path "/"})
-          (reitit/create-default-handler error-handlers)))
+          (reitit/router (routes (sente/start-server sente-config)))
+          (reitit/routes
+            (reitit/create-resource-handler {:path "/"})
+            (reitit/create-default-handler error-handlers)))
         (wrap-errors)
         (ring.forgery/wrap-anti-forgery)
         (ring.session/wrap-session session-config)