Overview
| Comment: | Automated merge of v1.63/9d4d98bcd5/integ into integ-home |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | integ-home |
| Files: | files | file ages | folders |
| SHA1: |
2e9f48e61db9040a7fe1c59d4220c020 |
| User & Date: | matt on 2017-02-02 17:54:33 |
| Other Links: | branch diff | manifest | tags |
Context
|
2017-02-02
| ||
| 22:10 | Automated merge of v1.63/81b0d79d6d/integ into integ-home check-in: caa6fe7473 user: matt tags: integ-home | |
| 17:54 | Automated merge of v1.63/9d4d98bcd5/integ into integ-home check-in: 2e9f48e61d user: matt tags: integ-home | |
| 17:41 | Merged server-log-handshaking to v1.63 check-in: 9d4d98bcd5 user: mrwellan tags: v1.63 | |
| 15:20 | Automated merge of html-gen/ae20a8a286/integ into integ-home check-in: 729025ee8c user: matt tags: integ-home | |
Changes
Modified rmt.scm from [6da9a206d9] to [9418412e88].
| ︙ | ︙ | |||
60 61 62 63 64 65 66 |
;; give up if more than 15 attempts
((> attemptnum 15)
(debug:print 0 *default-log-port* "ERROR: 15 tries to start/connect to server. Giving up.")
(exit 1))
;; reset the connection if it has been unused too long
((and *runremote*
(remote-conndat *runremote*)
| | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 |
;; give up if more than 15 attempts
((> attemptnum 15)
(debug:print 0 *default-log-port* "ERROR: 15 tries to start/connect to server. Giving up.")
(exit 1))
;; reset the connection if it has been unused too long
((and *runremote*
(remote-conndat *runremote*)
(let ((expire-time (+ (- start-time (remote-server-timeout *runremote*))(random 30)))) ;; add 30 seconds of noise so that not all running tests expire at the same time causing a storm of server starts
(< (http-transport:server-dat-get-last-access (remote-conndat *runremote*)) expire-time)))
(debug:print-info 12 *default-log-port* "rmt:send-receive, case 8")
(remote-conndat-set! *runremote* #f)
(mutex-unlock! *rmt-mutex*)
(rmt:send-receive cmd rid params attemptnum: attemptnum))
;; ensure we have a record for our connection for given area
((not *runremote*)
|
| ︙ | ︙ |
Modified server.scm from [5c1183db18] to [80b125d400].
| ︙ | ︙ | |||
219 220 221 222 223 224 225 |
(filter (lambda (rec)
(let ((start-time (list-ref rec 3))
(mod-time (list-ref rec 0)))
;; (print "start-time: " start-time " mod-time: " mod-time)
(and start-time mod-time
(> (- now start-time) 0) ;; been running at least 0 seconds
(< (- now mod-time) 16) ;; still alive - file touched in last 16 seconds
| > | > > | 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 |
(filter (lambda (rec)
(let ((start-time (list-ref rec 3))
(mod-time (list-ref rec 0)))
;; (print "start-time: " start-time " mod-time: " mod-time)
(and start-time mod-time
(> (- now start-time) 0) ;; been running at least 0 seconds
(< (- now mod-time) 16) ;; still alive - file touched in last 16 seconds
(< (- now start-time)
(+ (- (string->number (or (configf:lookup *configdat* "server" "runtime") "3600"))
180)
(random 360))) ;; under one hour running time +/- 180
)))
srvlst)
(lambda (a b)
(< (list-ref a 3)
(list-ref b 3))))))
(define (server:get-first-best areapath)
|
| ︙ | ︙ |