Overview
| Comment: | Removed heartbeat check, fixed typo |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | re-re-factor-server |
| Files: | files | file ages | folders |
| SHA1: |
d21a137b3693ee5b157089a768c01d4d |
| User & Date: | matt on 2014-02-15 23:01:55 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-02-16
| ||
| 21:02 | Removed ability to switch transports. Streamlined calls to http send-receive so that a ping-like call can be made check-in: a776e42a6b user: matt tags: re-re-factor-server | |
|
2014-02-15
| ||
| 23:01 | Removed heartbeat check, fixed typo check-in: d21a137b36 user: matt tags: re-re-factor-server | |
| 22:41 | Streamlined port sequencing for per-run db servers check-in: c6b8e8a9d8 user: matt tags: re-re-factor-server | |
Changes
Modified client.scm from [c71df3eef9] to [52a055740a].
| ︙ | ︙ | |||
83 84 85 86 87 88 89 | (begin (debug:print 0 "ERROR: Expected to be able to connect to a server by now. No server available for run-id = " run-id) (exit 1))) (begin (hash-table-set! *runremote* run-id hostinfo) (debug:print-info 11 "CLIENT SETUP, hostinfo=" hostinfo) (debug:print-info 11 "Using transport type of " transport (if hostinfo (conc " to connect to " hostinfo) "")) | | | 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 |
(begin
(debug:print 0 "ERROR: Expected to be able to connect to a server by now. No server available for run-id = " run-id)
(exit 1)))
(begin
(hash-table-set! *runremote* run-id hostinfo)
(debug:print-info 11 "CLIENT SETUP, hostinfo=" hostinfo)
(debug:print-info 11 "Using transport type of " transport (if hostinfo (conc " to connect to " hostinfo) ""))
(client:start run-id transport hostinfo)))))))
(define (client:start run-id transport server-info)
(case transport
;; ((fs)(if (not *megatest-db*)(set! *megatest-db* (open-db))))
((http)
;; this saves the server-info in the *runremote* hash and returns it
(http-transport:client-connect run-id
|
| ︙ | ︙ |
Modified tasks.scm from [4e3a51a8d8] to [c92f244886].
| ︙ | ︙ | |||
218 219 220 221 222 223 224 225 |
(define (tasks:get-server mdb run-id)
(let ((res #f)
(best #f))
(sqlite3:for-each-row
(lambda (id interface port pubport transport pid hostname)
(set! res (vector id interface port pubport transport pid hostname)))
mdb
"SELECT id,interface,port,pubport,transport,pid,hostname FROM servers
| > > < | | 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 |
(define (tasks:get-server mdb run-id)
(let ((res #f)
(best #f))
(sqlite3:for-each-row
(lambda (id interface port pubport transport pid hostname)
(set! res (vector id interface port pubport transport pid hostname)))
mdb
;; removed:
;; strftime('%s','now')-heartbeat < 10 AND
"SELECT id,interface,port,pubport,transport,pid,hostname FROM servers
WHERE mt_version=? AND run_id=? AND state='running'
ORDER BY start_time DESC LIMIT 1;" (common:version-signature) run-id)
res))
;; (define (tasks:get-all-servers mdb)
;; (let ((res '()))
;; (sqlite3:for-each-row
;; (lambda (id interface port pubport transport pid hostname)
|
| ︙ | ︙ |