Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -22,24 +22,28 @@
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 
 (include "common_records.scm")
 (include "db_records.scm")
 
+(define (server:make-server-url hostport)
+  (if (null? hostport)
+      #f
+      (conc "tcp://" hostname ":" port)))
+
 (define (server:run hostn)
   (debug:print 0 "Attempting to start the server ...")
-  (let ((host:port      (open-run-close db:get-var open-db "SERVER"))) ;; do whe already have a server running?
+  (let* ((hostport      (open-run-close tasks:get-best-server tasks:open-db)) ;; do whe already have a server running?
+	 (host:port (server:mak-server-url hostport)))
     (if host:port 
 	(begin
 	  (debug:print 0 "NOTE: server already running.")
 	  (if (server:client-setup)
 	      (begin 
-		(debug:print-info 0 "Server is alive, not starting another")
-		;;(exit)
-		)
+		(debug:print-info 0 "Server is alive, not starting another"))
 	      (begin
-		(debug:print-info 0 "Server is dead, removing flag and trying again")
-		(open-run-close db:del-var #f "SERVER")
+		(debug:print-info 0 "Server is dead, removing, deregistering it and trying again")
+		(open-run-close tasks:deregister tasks:open-db (car hostport) port: (cadr port))
 		(server:run hostn))))
 	(let* ((zmq-socket     #f)
 	       (hostname       (if (string=? "-" hostn)
 				   (get-host-name) 
 				   hostn))
@@ -51,11 +55,11 @@
 	  (set! *cache-on* #t)
 	  
 	  ;; what to do when we quit
 	  ;;
 	  (on-exit (lambda ()
-		     (open-run-close db:del-var #f "SERVER")
+		     (open-run-close tasks:server-deregister-self tasks:open-db)
 		     (let loop () 
 		       (let ((queue-len 0))
 			 (thread-sleep! (random 5))
 			 (mutex-lock! *incoming-mutex*)
 			 (set! queue-len (length *incoming-data*))
@@ -116,11 +120,11 @@
      (let ((zmq-url (conc "tcp://" host ":" p)))
        (print "Trying to start server on " zmq-url)
        (bind-socket s zmq-url)
        (set! *runremote* #f)
        (debug:print 0 "Server started on " zmq-url)
-       (open-run-close db:set-var #f "SERVER" zmq-url)
+       (open-run-close tasks:server-register tasks:open-db (current-process-id) host p 0 'live)
        s))))
 
 (define (server:client-setup)
   (let* ((hostinfo   (open-run-close db:get-var #f "SERVER"))
 	 (zmq-socket (make-socket 'req)))

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -71,18 +71,26 @@
     
 ;;======================================================================
 ;; Server and client management
 ;;======================================================================
 
+;; state: 'live, 'shutting-down, 'dead
 (define (tasks:server-register mdb pid hostname port priority state)
   (sqlite3:execute 
    mdb 
    "INSERT OR REPLACE INTO servers (pid,hostname,port,start_time,priority,state) VALUES(?,?,?,strftime('%s','now'),?);"
    pid hostname port priority state))
 
-(define (tasks:server-deregister mdb pid hostname)
-  (sqlite3:execute mdb "DELETE FROM servers WHERE pid=? AND hostname=?;" pid hostname))
+(define (tasks:server-deregister mdb hostname #!key (port #f)(pid #f))
+  (if pid
+      (sqlite3:execute mdb "DELETE FROM servers WHERE  hostname=? AND pid=?;" hostname pid)
+      (if port
+	  (sqlite3:execute mdb "DELETE FROM servers WHERE  hostname=? AND port=?;" hostname port)
+	  (debug:print 0 "ERROR: tasks:server-deregister called with neither pid nor port specified"))))
+
+(define (tasks:server-deregister-self mdb)
+  (tasks:server-deregister mdb pid: (current-process-id) (get-host-name)))
 
 (define (tasks:server-get-server-id mdb)
   ;; dunno yet
   0)
 
@@ -108,10 +116,20 @@
      "SELECT id,server_id,pid,hostname,cmdline,login_time,logout_time FROM clients WHERE server_id=?;"
      server-id)))
 
 (define (tasks:have-clients? mdb server-id)
   (null? (tasks:get-logged-in-clients mdb server-id)))
+
+(define (tasks:get-best-server mdb)
+  (let ((res '()))
+    (sqlite3:for-each-row
+     (lambda (id hostname port)
+       (set! res (list hostname port)))
+     mdb
+     "SELECT id,hostname,port FROM servers WHERE state='live' ORDER BY start_time DESC LIMIT 1;")
+    res))
+
 
 ;;======================================================================
 ;; Tasks and Task monitors
 ;;======================================================================
 

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -61,11 +61,11 @@
 
 cleanprep : ../*.scm Makefile */*.config
 	# if [ -e fullrun/megatest.db ]; then sqlite3 fullrun/megatest.db "delete from metadat where var='SERVER';";fi
 	mkdir -p /tmp/mt_runs /tmp/mt_links
 	cd ..;make install
-	rm -f fullrun/logging.db
+	rm -f fullrun/logging.db fullrun/monitor.db
 	touch cleanprep
 
 fullprep : cleanprep
 	cd fullrun;$(MEGATEST) -server - -debug $(DEBUG) &
 	sleep 5;cd fullrun;$(MEGATEST) -remove-runs :runname $(RUNNAME)% -target %/%/% -testpatt %/%