Tweak agent messaging error handling

1 files changed, 21 insertions, 10 deletions

diff --git a/guix-build-coordinator/agent-messaging/http/server.scm b/guix-build-coordinator/agent-messaging/http/server.scm
index d02bc83..9181736 100644
--- a/guix-build-coordinator/agent-messaging/http/server.scm
+++ b/guix-build-coordinator/agent-messaging/http/server.scm
@@ -423,19 +423,30 @@ port. Also, the port used can be changed by passing the --port option.\n"
 
   (with-exception-handler
       (lambda (exn)
-        (match method-and-path-components
-          ((method path-components ...)
-           (simple-format
-            (current-error-port)
-            "error: when processing: /~A ~A\n"
-            method (string-join path-components "/"))))
         (if (agent-error? exn)
             (render-json
              `((error . ,(agent-error-details exn)))
              #:code 400)
-            (render-json
-             `((error . ,(simple-format #f "~A" exn)))
-             #:code 500)))
-    controller-thunk
+            (begin
+              (match method-and-path-components
+                ((method path-components ...)
+                 (simple-format
+                  (current-error-port)
+                  "error: when processing: /~A ~A\n  ~A"
+                  method (string-join path-components "/")
+                  exn)))
+              (render-json
+               `((error . ,(simple-format #f "~A" exn)))
+               #:code 500))))
+    (with-exception-handler
+        (lambda (exn)
+          (catch #t
+            (lambda ()
+              (backtrace))
+            (lambda (key . args)
+              (simple-format (current-error-port)
+                             "error: guile crashed printing backtrace\n")))
+          (raise-exception exn))
+      controller-thunk)
     #:unwind? #t))