X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=eightsync%2Fagenda.scm;h=a2463a2a8a892aef7e4dc325558355030227737c;hb=9532a9722a3bf3ba3f4bb9478b3ebd27a3b51af7;hp=9f54e17aa06ca2faf76c652de922e803bfb027af;hpb=5a32dfc9d2b5a5b873d57ecdbf29f68a136cb0b0;p=8sync.git

diff --git a/eightsync/agenda.scm b/eightsync/agenda.scm
index 9f54e17..a2463a2 100644
--- a/eightsync/agenda.scm
+++ b/eightsync/agenda.scm
@@ -442,12 +442,6 @@ Will produce (0 . 0) instead of a negative number, if needed."
 ;;; Asynchronous escape to run things
 ;;; =================================
 
-(define (agenda-on-error agenda)
-  (const #f))
-
-(define (agenda-on-fail agenda)
-  (const #f))
-
 (define-syntax-rule (%8sync async-request)
   "Run BODY asynchronously at a prompt, passing args to make-future.
 
@@ -698,13 +692,29 @@ return the wrong thing via (%8sync) and trip themselves up."
              (agenda-queue agenda))
             (loop agenda))))))
 
-(define (print-error-and-continue . args)
+(define (print-error-and-continue key . args)
   "Frequently used as pre-unwind-handler for agenda"
-  (format (current-error-port) "\n*** Caught exception with arguments: ~s ***\n"
-          args)
-  (display-backtrace (make-stack #t 1 0)
-                     (current-error-port))
-  (newline (current-error-port)))
+  (cond
+   ((eq? key '8sync-caught-error)
+    (match args
+      ((orig-key orig-args stacks)
+       (display "\n*** Caught async exception. ***\n")
+       (format (current-error-port)
+               "* Original key '~s and arguments: ~s *\n"
+               orig-key orig-args)
+       (display "* Caught stacks below (ending with original) *\n\n")
+       (for-each
+        (lambda (s)
+          (display-backtrace s (current-error-port))
+          (newline (current-error-port)))
+        stacks))))
+   (else
+    (format (current-error-port)
+            "\n*** Caught exception with key '~s and arguments: ~s ***\n"
+            key args)
+    (display-backtrace (make-stack #t 1 0)
+                       (current-error-port))
+    (newline (current-error-port)))))
 
 (define-syntax-rule (maybe-catch-all (catch-handler pre-unwind-handler)
                                      body ...)