Index: http-transport.scm ================================================================== --- http-transport.scm +++ http-transport.scm @@ -236,32 +236,33 @@ ;; (condition-case (with-input-from-request "http://localhost"; #f read-lines) ;; ((exn http client-error) e (print e))) (set! res (vector success (db:string->obj - (handle-exceptions - exn - (begin - (set! success #f) - (debug:print 0 *default-log-port* "WARNING: failure in with-input-from-request to " fullurl ".") - (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) - (if *runremote* - (remote-conndat-set! *runremote* #f)) - ;; Killing associated server to allow clean retry.") - ;; (tasks:kill-server-run-id run-id) ;; better to kill the server in the logic that called this routine? - (mutex-unlock! *http-mutex*) - ;;; (signal (make-composite-condition - ;;; (make-property-condition 'commfail 'message "failed to connect to server"))) - ;;; "communications failed" - (db:obj->string #f)) + ;; handle-exceptions + ;; exn + ;; (begin + ;; (set! success #f) + ;; (debug:print 0 *default-log-port* "WARNING: failure in with-input-from-request to " fullurl ".") + ;; (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) + ;; (if *runremote* + ;; (remote-conndat-set! *runremote* #f)) + ;; ;; Killing associated server to allow clean retry.") + ;; ;; (tasks:kill-server-run-id run-id) ;; better to kill the server in the logic that called this routine? + ;; (mutex-unlock! *http-mutex*) + ;; ;;; (signal (make-composite-condition + ;; ;;; (make-property-condition 'commfail 'message "failed to connect to server"))) + ;; ;;; "communications failed" + ;; (db:obj->string #f)) (with-input-from-request ;; was dat fullurl (list (cons 'key "thekey") (cons 'cmd cmd) (cons 'params sparams)) - read-string)) - transport: 'http))) + read-string) + transport: 'http) + 0)) ;; added this speculatively ;; Shouldn't this be a call to the managed call-all-connections stuff above? (close-all-connections!) (mutex-unlock! *http-mutex*) )) (time-out (lambda () @@ -281,11 +282,11 @@ (debug:print-error 0 *default-log-port* "error occured at server, info=" (vector-ref res 2)) (debug:print 0 *default-log-port* " client call chain:") (print-call-chain (current-error-port)) (debug:print 0 *default-log-port* " server call chain:") (pp (vector-ref res 1) (current-error-port)) - (signal (vector-ref result 0)))) + (signal (vector-ref res 0)))) (signal (make-composite-condition (make-property-condition 'timeout 'message "nmsg-transport:client-api-send-receive-raw timed out talking to server")))))))