Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -293,11 +293,11 @@
 	     (debug:print-info 11 "final=" final)
 	     final)))))))
 
 ;; Send "cmd" with json payload "params" to serverdat and receive result
 ;;
-(define (http-transport:client-api-send-receive serverdat cmd params #!key (numretries 30))
+(define (http-transport:client-api-send-receive run-id serverdat cmd params #!key (numretries 30))
   (let* ((fullurl    (if (list? serverdat)
 			 (cadddr serverdat) ;; this is the uri for /api
 			 (begin
 			   (debug:print 0 "FATAL ERROR: http-transport:client-send-receive called with no server info")
 			   (exit 1))))
@@ -305,13 +305,13 @@
     (handle-exceptions
      exn
      (begin
        ;; TODO: Send this output to a log file so it isn't lost when running as daemon
        (print "ERROR IN http-transport:client-send-receive " ((condition-property-accessor 'exn 'message) exn))
-       (thread-sleep! 2)
+       (server:ensure-running run-id)
        (if (> numretries 0)
-	   (http-transport:client-api-send-receive serverdat cmd params numretries: (- numretries 1))))
+	   (http-transport:client-api-send-receive run-id serverdat cmd params numretries: (- numretries 1))))
      (begin
        (debug:print-info 11 "fullurl=" fullurl "\n")
        ;; set up the http-client here
        (max-retry-attempts 5)
        ;; consider all requests indempotent

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -45,11 +45,11 @@
     ((fs http)
      ;; if run-id is #f send the request to run-id = 0 server. This will be for main.db
      ;;
      (let* ((connection-info (client:setup (if run-id run-id 0)))
 	    (jparams         (db:obj->string params)) ;; (rmt:dat->json-str params))
-	    (res (http-transport:client-api-send-receive connection-info cmd jparams)))
+	    (res (http-transport:client-api-send-receive run-id connection-info cmd jparams)))
        (if res
 	   (db:string->obj res) ;; (rmt:json-str->dat res)
 	   (begin
 	     (debug:print 0 "ERROR: Bad value from http-transport:client-api-send-receive " res)
 	     #f))))

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -8,11 +8,11 @@
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 
 (require-extension (srfi 18) extras tcp s11n)
 
-(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
+(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest directory-utils)
 ;; (use zmq)
 
 (use spiffy uri-common intarweb http-client spiffy-request-vars)
 
 (declare (unit server))
@@ -125,16 +125,18 @@
     (if (or (not servers)
 	    (null? servers))
 	(begin
 	  (if (even? trycount) ;; just do the server start every other time through this loop (every 8 seconds)
 	      (let ((cmdln (conc (if (getenv "MT_MEGATEST") (getenv "MT_MEGATEST") "megatest")
-				 " -server - -daemonize -run-id " run-id)))
+				 " -server - -run-id " run-id " &> " run-id ".log &")))
 		(debug:print 0 "INFO: Starting server (" cmdln ") as none running ...")
 		;; (server:launch (string->symbol (args:get-arg "-transport" "http"))))
 		;; no need to use fork, no need to do the list-servers trick. Just start the damn server, it will exit on it's own
 		;; if there is an existing server
+		(push-directory *toppath*)
 		(system cmdln)
+		(pop-directory)
 		(thread-sleep! 3)
 		;; (process-run (car (argv)) (list "-server" "-" "-daemonize" "-transport" (args:get-arg "-transport" "http")))
 		)
 	      (begin
 		(debug:print-info 0 "Waiting for server to start")