@@ -91,11 +91,11 @@ (conc " -daemonize -log " logfile) "") " -debug 4 "))) ;; (conc " >> " logfile " 2>&1 &"))))) (debug:print 0 "INFO: Starting server (" cmdln ") as none running ...") (push-directory *toppath*) - (if (not (directory-exists? "logs"))(create-directory "logs")) + (if (not (directory-exists? "logs"))(create-directory "logs"))l ;; host.domain.tld match host? (if (and target-host ;; look at target host, is it host.domain.tld or ip address and does it ;; match current ip or hostname (not (string-match (conc "("curr-host "|" curr-host"\\..*)") target-host)) @@ -124,11 +124,11 @@ (if (eq? run-id 0) (server:run run-id) (rmt:start-server run-id))) (define (server:check-if-running run-id) - (let loop ((server (open-run-close tasks:get-server tasks:open-db run-id)) + (let loop ((server (tasks:get-server (tasks:get-db) run-id)) (trycount 0)) (if server ;; note: client:start will set *runremote*. this needs to be changed ;; also, client:start will login to the server, also need to change that. ;; @@ -140,11 +140,11 @@ ;; if the server didn't respond we must remove the record (if res #t (begin (debug:print-info 0 "server at " server " not responding, removing record") - (open-run-close tasks:server-force-clean-running-records-for-run-id tasks:open-db run-id + (tasks:server-force-clean-running-records-for-run-id (tasks:get-db) run-id " server:check-if-running") res))) #f))) ;; called in megatest.scm, host-port is string hostname:port @@ -153,11 +153,11 @@ (let* ((host-port (let ((slst (string-split host:port ":"))) (if (eq? (length slst) 2) (list (car slst)(string->number (cadr slst))) #f))) (toppath (launch:setup-for-run)) - (server-db-dat (if (not host-port)(open-run-close tasks:get-server tasks:open-db run-id) #f))) + (server-db-dat (if (not host-port)(tasks:get-server (tasks:get-db) run-id) #f))) (if (not run-id) (begin (debug:print 0 "ERROR: must specify run-id when doing ping, -run-id n") (print "ERROR: No run-id") (exit 1))