@@ -47,19 +47,16 @@
 ;; all routes though here end in exit ...
 ;;
 ;; start_server
 ;;
 (define (server:launch run-id transport-type)
-  (BB> "server:launch fired for run-id="run-id" transport-type="transport-type)
   (case transport-type
     ((http)(http-transport:launch run-id))
     ;;((nmsg)(nmsg-transport:launch run-id))
     ((rpc)  (rpc-transport:launch run-id))
     (else (debug:print-error 0 *default-log-port* "unknown server type " transport-type))))
-;;       (else   (debug:print-error 0 *default-log-port* "No known transport set, transport=" transport ", using rpc")
-;; 	      (rpc-transport:launch run-id)))))
-
+  
 ;;======================================================================
 ;; S E R V E R   U T I L I T I E S 
 ;;======================================================================
 
 ;; Get the transport
@@ -67,11 +64,11 @@
   (if *transport-type*
       *transport-type*
       (let ((ttype (string->symbol
 		    (or (args:get-arg "-transport")
 			(configf:lookup *configdat* "server" "transport")
-			"rpc"))))
+			*DEFAULT-TRANSPORT*))))
 	(set! *transport-type* ttype)
 	ttype)))
 	    
 ;; Generate a unique signature for this server
 (define (server:mk-signature)
@@ -112,13 +109,15 @@
 	 (homehost    (common:get-homehost)) ;; configf:lookup *configdat* "server" "homehost" ))
 	 (target-host (car homehost))
 	 (testsuite   (common:get-testsuite-name))
 	 (logfile     (conc *toppath* "/logs/server.log"))
 	 (cmdln (conc (common:get-megatest-exe)
-		      " -server " (or target-host "-") " -run-id " 0 (if (equal? (configf:lookup *configdat* "server" "daemonize") "yes")
-									      (conc " -daemonize -log " logfile)
-									      "")
+		      " -server " (or target-host "-") " -run-id " 0
+                      (if (equal? (configf:lookup *configdat* "server" "daemonize") "yes")
+                          (conc " -daemonize -log " logfile)
+                          "")
+                      " -transport " (server:get-transport)
 		      " -m testsuite:" testsuite)) ;; (conc " >> " logfile " 2>&1 &")))))
 	 (log-rotate  (make-thread common:rotate-logs  "server run, rotate logs thread")))
     ;; we want the remote server to start in *toppath* so push there
     (push-directory *toppath*)
     (debug:print 0 *default-log-port* "INFO: Trying to start server (" cmdln ") ...")
@@ -187,10 +186,22 @@
 	     dotfile
 	   (lambda ()
 	     (read-line)))
 	 #f))))
 
+
+(define (server:dotserver-starting)
+  (with-output-to-file
+      (conc *toppath* "/.starting-server")
+    (lambda ()
+      (print (current-process-id) " on " (get-host-name)))))
+
+(define (server:dotserver-starting-remove)
+  (delete-file* (conc *toppath* "/.starting-server")))
+  
+
+  
 ;; write a .server file in *toppath* with hostport
 ;; return #t on success, #f otherwise
 ;;
 (define (server:write-dotserver areapath hostport)
   (let ((lock-file   (conc areapath "/.server.lock"))
@@ -206,15 +217,15 @@
 	  (debug:print-info 0 *default-log-port* "server file " server-file " for " hostport " created")
 	  (common:simple-file-release-lock lock-file)
 	  res)
 	#f)))
 
-(define (server:remove-dotserver-file areapath hostport)
+(define (server:remove-dotserver-file areapath hostport #!key (force #f))
   (let ((dotserver   (server:read-dotserver areapath))
 	(server-file (conc areapath "/.server"))
 	(lock-file   (conc areapath "/.server.lock")))
-    (if (and dotserver (string-match (conc ".*:" hostport "$") dotserver)) ;; port matches, good enough info to decide to remove the file
+    (if (or force (and dotserver (string-match (conc ".*:" hostport "$") dotserver))) ;; port matches, good enough info to decide to remove the file
 	(if (common:simple-file-lock lock-file)
 	    (begin
 	      (handle-exceptions
 	       exn
 	       #f
@@ -226,11 +237,11 @@
 ;;
 (define (server:check-if-running areapath)
   (let* ((dotserver (server:read-dotserver areapath))) ;; tdbdat (tasks:open-db)))
     (if dotserver
 	(let* ((res (case *transport-type*
-		      ((http)(server:ping-server dotserver))
+		      ((http rpc)(server:ping-server dotserver))
 		      ;; ((nmsg)(nmsg-transport:ping (tasks:hostinfo-get-interface server)
 		      )))
 	  (if res
 	      dotserver
 	      #f))
@@ -265,11 +276,17 @@
 		(debug:print 0 *default-log-port*  "ERROR: bad host:port"))
 	    (if do-exit (exit 1))
 	    #f)
 	  (let* ((iface      (car host-port))
 		 (port       (cadr host-port))
-		 (server-dat (http-transport:client-connect iface port))
+		 (server-dat
+                  (case (remote-transport *runremote*)
+                    ((http) (http-transport:client-connect iface port))
+                    ((rpc) (rpc-transport:client-connect iface port))
+                    (else
+                     (debug:print 0 *default-log-port* "ERROR: transport " (remote-transport *runremote*) " not supported (4)")
+                     (exit))))
 		 (login-res  (rmt:login-no-auto-client-setup server-dat)))
 	    (if (and (list? login-res)
 		     (car login-res))
 		(begin
 		  (print "LOGIN_OK")
@@ -298,15 +315,21 @@
     (set! *db-last-access* (current-seconds)) ;; might not be needed.
     (if (equal? *toppath* toppath)
 	#t
 	#f)))
 
+;; default to five minutes if not specified in megatest.config server section.
+;;
 (define (server:get-timeout)
-  (let ((tmo (configf:lookup  *configdat* "server" "timeout")))
-    (if (and (string? tmo)
-	     (string->number tmo))
-	(* 60 60 (string->number tmo))
-	;; (* 3 24 60 60) ;; default to three days
-	(* 60 1)         ;; default to one minute
-	;; (* 60 60 25)      ;; default to 25 hours
-	)))
+  (string->number
+   (or (configf:lookup  *configdat* "server" "timeout")
+       "600")))
+
+;;   (let ((tmo (configf:lookup  *configdat* "server" "timeout")))
+;;     (if (and (string? tmo)
+;; 	     (string->number tmo))
+;; 	(* 60 60 (string->number tmo))
+;; 	;; (* 3 24 60 60) ;; default to three days
+;; 	(* 60 1)         ;; default to one minute
+;; 	;; (* 60 60 25)      ;; default to 25 hours
+;; 	)))