@@ -85,17 +85,18 @@
     
 ;;======================================================================
 ;; Server and client management
 ;;======================================================================
 
-;; make-vector-record tasks hostinfo id interface port pubport transport
-(define (make-tasks:hostinfo)(make-vector 5))
+;; make-vector-record tasks hostinfo id interface port pubport transport pid hostname
 (define (tasks:hostinfo-get-id          vec)    (vector-ref  vec 0))
 (define (tasks:hostinfo-get-interface   vec)    (vector-ref  vec 1))
 (define (tasks:hostinfo-get-port        vec)    (vector-ref  vec 2))
 (define (tasks:hostinfo-get-pubport     vec)    (vector-ref  vec 3))
 (define (tasks:hostinfo-get-transport   vec)    (vector-ref  vec 4))
+(define (tasks:hostinfo-get-pid         vec)    (vector-ref  vec 5))
+(define (tasks:hostinfo-get-hostname    vec)    (vector-ref  vec 6))
 
 ;; state: 'live, 'shutting-down, 'dead
 (define (tasks:server-register mdb pid interface port priority state transport #!key (pubport -1))
   (debug:print-info 11 "tasks:server-register " pid " " interface " " port " " priority " " state)
   (sqlite3:execute 
@@ -188,15 +189,15 @@
 ;; remove any others. will not necessarily remove all!
 (define (tasks:get-best-server mdb)
   (let ((res '())
 	(best #f))
     (sqlite3:for-each-row
-     (lambda (id hostname interface port pid)
-       (set! res (cons (list hostname interface port pid id) res))
+     (lambda (id interface port pubport transport pid hostname)
+       (set! res (cons (vector id interface port pubport transport pid hostname) res))
        (debug:print-info 2 "Found existing server " hostname ":" port " registered in db"))
      mdb
-     "SELECT id,hostname,interface,port,pid FROM servers
+     "SELECT id,interface,port,pubport,transport,pid,hostname FROM servers
          WHERE strftime('%s','now')-heartbeat < 10
                AND mt_version=? ORDER BY start_time ASC LIMIT 1;" megatest-version)
     ;; for now we are keeping only one server registered in the db, return #f or first server found
     (if (null? res) #f (car res))))