Merge pull request #64 from jonathannewman/maint/main/add-method-uri

(PE-38702) add method and uri to unhandled exception logging

CHANGELOG.md

@@ -1,4 +1,8 @@
-# 2.0.2
+# 2.0.4
+* add calling method and uri to unhandled exception logging
+# 2.0.3 
+* released with no changes due to issues with licensing in project.clj
+# 2.0.2 - unreleased
 * update to clj parent 7.3.31
 * optimize the `wrap-uncaught-errors` to avoid anonymous functions, and ensure streams are closed
 * add new wrappers: 

src/puppetlabs/ring_middleware/core.clj

@@ -210,13 +210,14 @@
                    (catch utils/schema-error? e
                      (response e)))))))
 
-(defn handle-error-response
-  [e type]
+(defn- handle-error-response
+  [request e type]
   (with-open [baos (ByteArrayOutputStream.)
               print-stream (PrintStream. baos)]
     (.printStackTrace e print-stream)
-    (let [msg (trs "Internal Server Error: {0}" (.toString e))]
-      (log/error (trs "Internal Server Error: {0}" (.toString baos)))
+    (let [msg (trs "Internal Server Error: {0}" (.toString e))
+          method (-> request :request-method name str/upper-case)]
+      (log/error (trs "Internal Server Error for {1} {2}: {0}" (.toString baos) method (:uri request)))
       (case type
         :json (utils/json-response InternalServiceError
                                    {:kind :application-error
@@ -234,7 +235,7 @@
       (try
         (handler request)
         (catch Throwable e
-          (handle-error-response e type))))))
+          (handle-error-response request e type))))))
 
 (schema/defn ^:always-validate wrap-add-referrer-policy :- IFn
   "Adds referrer policy to the header as 'Referrer-Policy: no-referrer' or 'Referrer-Policy: same-origin'"