@@ -289,11 +289,11 @@ (port (vector-ref server 3)) (start-time (vector-ref server 4)) (priority (vector-ref server 5)) (state (vector-ref server 6)) (stat-numc (server:ping hostname port)) - (status (car stat-numc)) + (status (car stat-numc)) (numclients (cadr stat-numc)) (killed #f) (zmq-socket (if status (server:client-connect hostname port) #f))) ;; no need to login as status of #t indicates we are connecting to correct ;; server @@ -308,32 +308,34 @@ (cdb:kill-server zmq-socket) (debug:print-info 1 "Killed server by host:port at " hostname ":" port)) (debug:print-info 1 "Removing defunct server record for " hostname ":" port)) (set! killed #t))) (if (and kpid - (equal? hostname (car khost-port)) - (equal? kpid pid)) + ;; (equal? hostname (car khost-port)) + (equal? kpid pid)) ;;; YEP, ALL WITH PID WILL BE KILLED!!! (begin (open-run-close tasks:server-deregister tasks:open-db hostname pid: pid) (set! killed #t) (if status (cdb:kill-server zmq-socket)) (debug:print-info 1 "Killed server by pid at " hostname ":" port))) ;; (if zmq-socket (close-socket zmq-socket)) (format #t fmtstr id pid hostname port start-time priority status numclients))) servers) + (debug:print-info 1 "Done with listservers") + (exit) ;; must do, would have to add checks to many/all calls below (set! *didsomething* #t)))) ;; if not list or kill then start a client (if appropriate) (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test") (eq? (length (hash-table-keys args:arg-hash)) 0)) (debug:print-info 1 "Server connection not needed") ;; ping servers only if -runall -runtests (let ((ping (args-defined? "-runall" "-runtests" "-remove-runs" "-set-state-status" "-rerun" "-rollup" "-lock" "-unlock" - "-set-values" "-list-runs"))) + "-set-values" "-list-runs" "-repl"))) (server:client-launch do-ping: ping)))) - + ;;====================================================================== ;; Remove old run(s) ;;====================================================================== ;; since several actions can be specified on the command line the removal