@@ -272,14 +272,14 @@ (if (or (args:get-arg "-listservers") (args:get-arg "-killserver")) (let ((tl (setup-for-run))) (if tl (let ((servers (open-run-close tasks:get-all-servers tasks:open-db)) - (fmtstr "~5a~8a~20a~5a~20a~9a~20a~5a\n") + (fmtstr "~5a~8a~8a~20a~5a~20a~9a~20a\n") (servers-to-kill '())) - (format #t fmtstr "Id" "Pid" "Host" "Port" "Time" "Priority" "State" "Num Clients") - (format #t fmtstr "==" "===" "====" "====" "====" "========" "=====" "===========") + (format #t fmtstr "Id" "MTver" "Pid" "Host" "Port" "Time" "Priority" "State") + (format #t fmtstr "==" "=====" "===" "====" "====" "====" "========" "=====") (for-each (lambda (server) (let* ((killinfo (args:get-arg "-killserver")) (khost-port (if killinfo (if (substring-index ":" killinfo)(string-split ":") #f) #f)) (kpid (if killinfo (if (substring-index ":" killinfo) #f (string->number killinfo)) #f)) @@ -288,13 +288,12 @@ (hostname (vector-ref server 2)) (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)) - (numclients (cadr stat-numc)) + (mt-ver (vector-ref server 7)) + (status (open-run-close tasks:server-alive? tasks:open-db hostname port: port)) (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 (if (or (not status) ;; no point in keeping dead records in the db @@ -316,12 +315,12 @@ (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))) + (format #t fmtstr id mt-ver pid hostname port start-time priority + status))) 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)