Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -30,21 +30,25 @@
       (conc "tcp://" hostname ":" port)))
 
 (define (server:run hostn)
   (debug:print 0 "Attempting to start the server ...")
   (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)))
+	 (host:port (server:make-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"))
 	      (begin
 		(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))))
+		;; (server:run hostn)
+		(debug:print 0 "WOULD NORMALLY START ANOTHER SERVER HERE")
+		)
+	      )
+	  )
 	(let* ((zmq-socket     #f)
 	       (hostname       (if (string=? "-" hostn)
 				   (get-host-name) 
 				   hostn))
 	       (ipaddrstr      (let ((ipstr (if (string=? "-" hostn)
@@ -151,17 +155,19 @@
 		 (begin
 		   (debug:print-info 2 "Failed to login or connect to " hostinfo)
 		   (set! *runremote* #f)
 		   #f)))))
 	(begin
-	  (debug:print-info 2 "No server available, attempting to start one...")
-	  (system (conc "megatest -server - " (if (args:get-arg "-debug")
-						  (conc "-debug " (args:get-arg "-debug"))
-						  "")
-			" &"))
-	  (sleep 5)
-	  (server:client-setup)))))
+	  (debug:print-info 0 "NO SERVER RUNNING! PLEASE START ONE! E.g. \"megatest -server - &\"")
+	;;   (debug:print-info 2 "No server available, attempting to start one...")
+	;;   (system (conc (car (argv)) " -server - " (if (args:get-arg "-debug")
+	;; 					  (conc "-debug " (args:get-arg "-debug"))
+	;; 					  "")
+	;; 		" &"))
+	  ;; (sleep 5)
+	  ;; (server:client-setup)
+	  ))))
 
 (define (server:launch)
   (let* ((toppath (setup-for-run)))
     (debug:print-info 0 "Starting the standalone server")
     (if *toppath* 

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -54,19 +54,19 @@
                                   hostname TEXT,
                                   port INTEGER,
                                   start_time TIMESTAMP,
                                   priority INTEGER,
                                   state TEXT,
-                               CONSTRAINT servers_constraint UNIQUE (pid,hostname);")
+                               CONSTRAINT servers_constraint UNIQUE (pid,hostname));")
 	  (sqlite3:execute mdb "CREATE TABLE IF NOT EXISTS clients (id INTEGER PRIMARY KEY,
                                   server_id INTEGER,
                                   pid INTEGER,
                                   hostname TEXT,
                                   cmdline TEXT,
                                   login_time TIMESTAMP,
                                   logout_time TIMESTAMP DEFAULT -1,
-                                CONSTRAINT clients_constraint UNIQUE (pid,hostname);")
+                                CONSTRAINT clients_constraint UNIQUE (pid,hostname));")
                                   
 	  ))
     mdb))
     
 ;;======================================================================
@@ -75,11 +75,11 @@
 
 ;; 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'),?);"
+   "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 hostname #!key (port #f)(pid #f))
   (if pid
       (sqlite3:execute mdb "DELETE FROM servers WHERE  hostname=? AND pid=?;" hostname pid)

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -18,10 +18,13 @@
 NEWTARGET  = "-target $(OS)/$(FS)/$(VER)"
 TARGET     = "-target ubuntu/nfs/none"
 
 all : test1 test2 test3 test4 test5
 
+test0 : cleanprep
+	cd simplerun ; $(MEGATEST) -server - -debug $(DEBUG)&
+
 test1 : cleanprep
 	rm -f simplerun/megatest.db
 	rm -rf simplelinks/ simpleruns/
 	mkdir -p simplelinks simpleruns
 	cd simplerun;cp ../../*_records.scm .;perl -pi.bak -e 's/define-inline/define/' *_records.scm
@@ -61,11 +64,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 fullrun/monitor.db
+	rm -f */logging.db */monitor.db
 	touch cleanprep
 
 fullprep : cleanprep
 	cd fullrun;$(MEGATEST) -server - -debug $(DEBUG) &
 	sleep 5;cd fullrun;$(MEGATEST) -remove-runs :runname $(RUNNAME)% -target %/%/% -testpatt %/%
@@ -81,9 +84,12 @@
 	rm cleanprep
 
 kill :
 	killall -v mtest main.sh dboard || true
 	rm -f fullrun/megatest.db fullrun/logging.db || true
-	killall -v -9 mtest dboard || true
+	killall -v mtest dboard || true
+
+hardkill : kill
+	sleep 5;killall -v mtest main.sh dboard -9
 
 runforever :
 	while(ls); do runname=`date +%F-%R:%S`;(cd fullrun;$(MEGATEST) -runall -target ubuntu/nfs/none :runname $$runname;/home/matt/data/megatest/megatest -runall -target ubuntu/nfs/none :runname $$runname;/home/matt/data/megatest/megatest -runall -target ubuntu/nfs/none :runname $$runname);done