Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -308,14 +308,16 @@
 		    (if (eq? trycount 0) ;; just do the server start once
 			(begin
 			  (debug:print 0 "INFO: Starting server as none running ...")
 			  ;; (server:launch (string->symbol (args:get-arg "-transport" "http"))))
 			  ;; (process-run (car (argv)) (list "-server" "-" "-daemonize" "-transport" (args:get-arg "-transport" "http")))
-			  (process-fork (lambda ()
-					  (daemon:ize)
-					  (server:launch (string->symbol (args:get-arg "-transport" "http")))))
-			  (thread-sleep! 3))
+			  (system "megatest -list-servers | grep alive || megatest -server - -daemonize && sleep 3")
+			  ;; (process-fork (lambda ()
+			  ;;       	  (daemon:ize)
+			  ;;       	  (server:launch (string->symbol (args:get-arg "-transport" "http")))))
+			  ;; (thread-sleep! 3)
+			  )
 			(debug:print-info 0 "Waiting for server to start"))
 		    (loop (open-run-close tasks:get-best-server tasks:open-db) 
 			  (+ trycount 1)))
 		  (debug:print 0 "INFO: Server(s) running " servers)
 		  )))))