Overview
| Comment: | server fixes |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.62-no-rpc |
| Files: | files | file ages | folders |
| SHA1: |
dee83609d299ca1e6e4331fd523b57ba |
| User & Date: | mrwellan on 2016-12-01 16:17:10 |
| Other Links: | branch diff | manifest | tags |
Context
|
2016-12-01
| ||
| 23:00 | Fixed some server functions. Misc. cleanup check-in: 632d7c9f79 user: matt tags: v1.62-no-rpc | |
| 16:17 | server fixes check-in: dee83609d2 user: mrwellan tags: v1.62-no-rpc | |
| 15:58 | server fixes check-in: f0c98a8cd8 user: mrwellan tags: v1.62-no-rpc | |
Changes
Modified http-transport.scm from [e3c099e72f] to [879b6e88d1].
| ︙ | ︙ | |||
234 235 236 237 238 239 240 |
(let* ((send-recieve (lambda ()
(mutex-lock! *http-mutex*)
;; (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
| | | | | | | | | | | | | | | | | | > | 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 |
(let* ((send-recieve (lambda ()
(mutex-lock! *http-mutex*)
;; (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))
(with-input-from-request ;; was dat
fullurl
(list (cons 'key "thekey")
(cons 'cmd cmd)
(cons 'params sparams))
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 ()
(thread-sleep! 45)
#f))
|
| ︙ | ︙ | |||
279 280 281 282 283 284 285 | res (begin ;; note: this code also called in nmsg-transport - consider consolidating it (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)) | | | 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 | res (begin ;; note: this code also called in nmsg-transport - consider consolidating it (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 res 0)))) (signal (make-composite-condition (make-property-condition 'timeout 'message "nmsg-transport:client-api-send-receive-raw timed out talking to server"))))))) ;; careful closing of connections stored in *runremote* ;; |
| ︙ | ︙ |