Overview
Comment: | got test4 and dashboard to work; switched transport to rpc in fullrun/megatest.config. default is still http as per common:get-transport-type proc which is now called from launch:setup-body |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.62-rpc |
Files: | files | file ages | folders |
SHA1: |
6c63f7e61ac13f17a6faec4fe4fbae2a |
User & Date: | bjbarcla on 2016-12-06 17:40:54 |
Other Links: | branch diff | manifest | tags |
Context
2016-12-07
| ||
10:58 | kept up with v1.63 check-in: dbcfa51c6d user: bjbarcla tags: v1.62-rpc | |
2016-12-06
| ||
17:40 | got test4 and dashboard to work; switched transport to rpc in fullrun/megatest.config. default is still http as per common:get-transport-type proc which is now called from launch:setup-body check-in: 6c63f7e61a user: bjbarcla tags: v1.62-rpc | |
16:59 | got client to start server in rpc mode check-in: 090fbdd4c6 user: bjbarcla tags: v1.62-rpc | |
Changes
Modified common.scm from [1c3ede54f0] to [e93512d330].
︙ | ︙ | |||
113 114 115 116 117 118 119 | (define *task-db* #f) ;; (vector db path-to-db) (define *db-access-allowed* #t) ;; flag to allow access (define *db-access-mutex* (make-mutex)) (define *db-cache-path* #f) ;; SERVER (define *my-client-signature* #f) | | > > > > > > > > > > | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | (define *task-db* #f) ;; (vector db path-to-db) (define *db-access-allowed* #t) ;; flag to allow access (define *db-access-mutex* (make-mutex)) (define *db-cache-path* #f) ;; SERVER (define *my-client-signature* #f) (define *transport-type* #f) ;; override with [server] transport http|rpc|nmsg (define (common:set-transport-type) (set! *transport-type* (string->symbol (or (args:get-arg "-transport") (configf:lookup *configdat* "server" "transport") "http"))) *transport-type*) (define *runremote* #f) ;; if set up for server communication this will hold <host port> (define *max-cache-size* 0) (define *logged-in-clients* (make-hash-table)) (define *server-id* #f) (define *server-info* #f) (define *time-to-exit* #f) (define *server-run* #t) |
︙ | ︙ |
Modified launch.scm from [4e784cfd15] to [92d3f0b9e5].
︙ | ︙ | |||
814 815 816 817 818 819 820 821 822 823 824 825 826 827 | (set! *runconfigdat* rdat) (set! *toppath* toppath) (set! *configstatus* 'partial)) (begin (debug:print-error 0 *default-log-port* "No " mtconfig " file found. Giving up.") (exit 2)))))) ;; additional house keeping (let* ((linktree (or (getenv "MT_LINKTREE") (if *configdat* (configf:lookup *configdat* "setup" "linktree") #f)))) (if linktree (begin (if (not (file-exists? linktree)) (begin (handle-exceptions | > | 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 | (set! *runconfigdat* rdat) (set! *toppath* toppath) (set! *configstatus* 'partial)) (begin (debug:print-error 0 *default-log-port* "No " mtconfig " file found. Giving up.") (exit 2)))))) ;; additional house keeping (common:set-transport-type) (let* ((linktree (or (getenv "MT_LINKTREE") (if *configdat* (configf:lookup *configdat* "setup" "linktree") #f)))) (if linktree (begin (if (not (file-exists? linktree)) (begin (handle-exceptions |
︙ | ︙ |
Modified megatest.scm from [46d15d3c2a] to [f3269063a2].
︙ | ︙ | |||
325 326 327 328 329 330 331 332 333 334 335 336 337 338 | "-q" ;; quiet 0, errors/warnings only ) args:arg-hash 0)) ;; Add args that use remargs here ;; (if (and (not (null? remargs)) (not (or (args:get-arg "-runstep") (args:get-arg "-envcap") (args:get-arg "-envdelta") ) )) | > | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 | "-q" ;; quiet 0, errors/warnings only ) args:arg-hash 0)) ;; Add args that use remargs here ;; (if (and (not (null? remargs)) (not (or (args:get-arg "-runstep") (args:get-arg "-envcap") (args:get-arg "-envdelta") ) )) |
︙ | ︙ | |||
697 698 699 700 701 702 703 | (if (args:get-arg "-server") ;; Server? Start up here. ;; (let ((tl (launch:setup)) ;; (run-id (and (args:get-arg "-run-id") ;; (string->number (args:get-arg "-run-id")))) | | < < | 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 | (if (args:get-arg "-server") ;; Server? Start up here. ;; (let ((tl (launch:setup)) ;; (run-id (and (args:get-arg "-run-id") ;; (string->number (args:get-arg "-run-id")))) (transport-type *transport-type* )) (server:launch 0 transport-type) (set! *didsomething* #t))) ;; ;; (debug:print-error 0 *default-log-port* "server requires run-id be specified with -run-id"))) ;; ;; ;; Not a server? This section will decide how to communicate ;; ;; ;; ;; Setup client for all expect listed here |
︙ | ︙ |
Modified tests/fullrun/megatest.config from [353b25ebc0] to [eec8c46fb2].
︙ | ︙ | |||
155 156 157 158 159 160 161 | [server] # force use of server always # required yes # Use http instead of direct filesystem access | > | | 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | [server] # force use of server always # required yes # Use http instead of direct filesystem access transport rpc # transport http # transport fs # transport nmsg synchronous 0 # If the server can't be started on this port it will try the next port until # it succeeds |
︙ | ︙ |