Overview
| Comment: | got client to start server in rpc mode |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.62-rpc |
| Files: | files | file ages | folders |
| SHA1: |
090fbdd4c620e888820daaaf0c36826b |
| User & Date: | bjbarcla on 2016-12-06 16:59:06 |
| Other Links: | branch diff | manifest | tags |
Context
|
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 | |
|
2016-12-05
| ||
| 22:08 | wip - client api does not abort due to api mismatch, but does not work either check-in: c913299f5d user: bjbarcla tags: v1.62-rpc | |
Changes
Modified rpc-transport.scm from [6ca03face9] to [5da1898b4d].
| ︙ | ︙ | |||
415 416 417 418 419 420 421 |
(hostname (if (string=? "-" hostn)
(get-host-name)
hostn))
(ipaddrstr (if (string=? "-" hostn)
(server:get-best-guess-address hostname) ;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
| > > > > | < < < < | 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 |
(hostname (if (string=? "-" hostn)
(get-host-name)
hostn))
(ipaddrstr (if (string=? "-" hostn)
(server:get-best-guess-address hostname) ;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
(string-intersperse
(map number->string
(u8vector->list
(hostname->ip hostn))) ".")
))
(portnum (let ((res (rpc:default-server-port))) res))
(host:port (conc (if ipaddrstr ipaddrstr hostname) ":" portnum)))
(tasks:server-set-interface-port (db:delay-if-busy (tasks:open-db)) server-id ipaddrstr portnum)
;;============================================================
;; activate thread th1 to attach opened tcp port to rpc server
;;=============================================================
(thread-start! th1)
(set! db *inmemdb*)
(debug:print 0 *default-log-port* "Server started on " host:port)
;; (thread-sleep! 5)
(if (retry-thunk (lambda ()
(rpc-transport:self-test run-id ipaddrstr portnum))
final-failure-returns-actual: #t
)
(debug:print 0 *default-log-port* "INFO: rpc self test passed!")
(begin
(debug:print 0 *default-log-port* "Error: rpc listener did not pass self test. Shutting down. On: " host:port)
(tasks:server-set-state! (db:delay-if-busy (tasks:open-db)) server-id "dead")
(tcp-close rpc:listener) ;; gotta exit nicely and free up that tcp port
(rpc-transport:server-shutdown server-id rpc:listener)
(exit)))
(mutex-lock! *heartbeat-mutex*)
(set! *last-db-access* (current-seconds))
(mutex-unlock! *heartbeat-mutex*)
;;(on-exit (lambda ()
|
| ︙ | ︙ | |||
600 601 602 603 604 605 606 |
(tcp-buffer-size 0) ;; gotta do this because http-transport undoes it.
(let* ((testing-res ((rpc:procedure 'testing host port)))
(login-res ((rpc:procedure 'server:login host port) *toppath*))
(res (and login-res (equal? testing-res "Just testing"))))
(if login-res
(begin
| | | 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 |
(tcp-buffer-size 0) ;; gotta do this because http-transport undoes it.
(let* ((testing-res ((rpc:procedure 'testing host port)))
(login-res ((rpc:procedure 'server:login host port) *toppath*))
(res (and login-res (equal? testing-res "Just testing"))))
(if login-res
(begin
;;(BB> "Self test PASS. login-res="login-res" testing-res="testing-res" *toppath*="*toppath*)
#t)
(begin
(BB> "Self test fail. login-res="login-res" testing-res="testing-res" *toppath*="*toppath*)
#f))
res))
|
| ︙ | ︙ |
Modified server.scm from [6aa7bdfd53] to [8582b4bb20].
| ︙ | ︙ | |||
114 115 116 117 118 119 120 | (curr-ip (server:get-best-guess-address curr-host)) (curr-pid (current-process-id)) (homehost (common:get-homehost)) ;; configf:lookup *configdat* "server" "homehost" )) (target-host (car homehost)) (testsuite (common:get-testsuite-name)) (logfile (conc *toppath* "/logs/server.log")) (cmdln (conc (common:get-megatest-exe) | | > | | > | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 |
(curr-ip (server:get-best-guess-address curr-host))
(curr-pid (current-process-id))
(homehost (common:get-homehost)) ;; configf:lookup *configdat* "server" "homehost" ))
(target-host (car homehost))
(testsuite (common:get-testsuite-name))
(logfile (conc *toppath* "/logs/server.log"))
(cmdln (conc (common:get-megatest-exe)
" -server " (or target-host "-") " -run-id " 0
(if (equal? (configf:lookup *configdat* "server" "daemonize") "yes")
(conc " -daemonize -log " logfile)
"")
" -transport " (server:get-transport)
" -m testsuite:" testsuite)) ;; (conc " >> " logfile " 2>&1 &")))))
(log-rotate (make-thread common:rotate-logs "server run, rotate logs thread")))
;; we want the remote server to start in *toppath* so push there
(push-directory *toppath*)
(debug:print 0 *default-log-port* "INFO: Trying to start server (" cmdln ") ...")
(thread-start! log-rotate)
|
| ︙ | ︙ |