Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -23,10 +23,12 @@ (define (toplevel-command . a) #f) (declare (uses common)) ;; (declare (uses megatest-version)) (declare (uses margs)) +(declare (uses commonmod)) +(declare (uses commonmod.import)) (declare (uses runs)) (declare (uses launch)) (declare (uses server)) (declare (uses client)) (declare (uses tests)) @@ -43,14 +45,13 @@ (declare (uses env)) (declare (uses diff-report)) (declare (uses db)) (declare (uses dbmod)) (declare (uses dbmod.import)) -(declare (uses commonmod)) -(declare (uses commonmod.import)) (declare (uses dbfile)) (declare (uses dbfile.import)) +(declare (uses tcp-transport)) ;; (declare (uses debugprint)) ;; (declare (uses debugprint.import)) ;; (declare (uses mtargs)) ;; (declare (uses mtargs.import)) @@ -57,11 +58,12 @@ ;; (declare (uses ftail)) ;; (import ftail) (import dbmod commonmod - dbfile) + dbfile + tcp-transport) (define *db* #f) ;; this is only for the repl, do not use in general!!!! (include "common_records.scm") (include "key_records.scm") @@ -927,10 +929,11 @@ (let* ((run-id (args:get-arg-number "-run-id")) (tl (launch:setup))) (case (rmt:transport-mode) ((http)(http-transport:launch)) ((tcp) + (debug:print 0 *default-log-port* "INFO: Running using tcp method.") (if run-id (tt:start-server tl (dbmod:run-id->dbfname run-id)) (begin (debug:print 0 *default-log-port* "ERROR: transport mode is tcp - -run-id is required.") (exit 1)))) Index: tcp-transportmod.scm ================================================================== --- tcp-transportmod.scm +++ tcp-transportmod.scm @@ -144,11 +144,10 @@ ;; to pull in more modules ;; (define (tt:start-server areapath dbfname handler) ;; is there already a server for this dbfile? Then exit. (let* ((ttdat (make-tt-srv areapath: areapath)) - ;; (dbfname (dbmod:run-id->dbfname run-id)) (servers (tt:find-server ttdat dbfname))) (tt-srv-handler-set! ttdat handler) (if (null? servers) (begin (tt:start-tcp-server ttdat) ;; start the tcp-server which applies handler to incoming data @@ -237,11 +236,11 @@ (clean-proc (lambda () (delete-file* servinf)))) (tt-srv-cleanup-proc-set! ttdat clean-proc) (with-output-to-file servinf (lambda () - (print "SERVER STARTED: "host":"port" AT "(current-seconds)" server-id: "serv-id" pid: "(current-process-id)))) + (print "SERVER STARTED: "host":"port" AT "(current-seconds)" server-id: "serv-id" pid: "(current-process-id)" dbfname: "dbfname))) serv-id))) ;; find valid server ;; get servers listed, last part of name must match : ;; if more than one, wait one second and look again