@@ -54,31 +54,31 @@
 ;; client:setup
 ;;
 ;; lookup_server, need to remove *runremote* stuff
 ;;
 (define (client:setup run-id #!key (remaining-tries 10) (failed-connects 0))
-  (debug:print 0 "INFO: client:setup remaining-tries=" remaining-tries)
+  (debug:print-info 0 "client:setup remaining-tries=" remaining-tries)
   (if (<= remaining-tries 0)
       (begin
 	(debug:print 0 "ERROR: failed to start or connect to server for run-id " run-id)
 	(exit 1))
       (let ((host-info (hash-table-ref/default *runremote* run-id #f)))
-	(debug:print-info 0 "client:setup host-info=" host-info ", remaining-tries=" remaining-tries)
 	(if host-info
 	    (let* ((iface     (http-transport:server-dat-get-iface host-info))
 		   (port      (http-transport:server-dat-get-port  host-info))
 		   (start-res (http-transport:client-connect iface port))
-		   ;; (ping-res  (server:ping-server run-id iface port))
 		   (ping-res  (rmt:login-no-auto-client-setup start-res run-id)))
 	      (if ping-res   ;; sucessful login?
 		  (begin
-		    (http-transport:close-connections run-id)
+		    (debug:print-info 0 "client:setup, ping is good using host-info=" host-info ", remaining-tries=" remaining-tries)
+		    ;; Why add the close-connections here?
+		    ;; (http-transport:close-connections run-id)
 		    (hash-table-set! *runremote* run-id start-res)
 		    start-res)  ;; return the server info
 		  (if (member remaining-tries '(9 6 4 2))
 		      (begin    ;; login failed
-			(debug:print 25 "INFO: client:setup start-res=" start-res ", run-id=" run-id ", server-dat=" host-info)
+			(debug:print-info 0 "client:setup, ping is bad for start-res=" start-res " and *runremote*=" host-info)
 			(http-transport:close-connections run-id)
 			(hash-table-delete! *runremote* run-id)
 			(open-run-close tasks:server-force-clean-run-record
 			 		tasks:open-db
 			 		run-id 
@@ -98,19 +98,20 @@
 	      (debug:print-info 0 "client:setup server-dat=" server-dat ", remaining-tries=" remaining-tries)
 	      (if server-dat
 		  (let* ((iface     (tasks:hostinfo-get-interface server-dat))
 			 (port      (tasks:hostinfo-get-port      server-dat))
 			 (start-res (http-transport:client-connect iface port))
-			 ;; (ping-res  (server:ping-server run-id iface port))
 			 (ping-res  (rmt:login-no-auto-client-setup start-res run-id)))
-		    (if start-res
+		    (if (and start-res
+			     ping-res)
 			(begin
 			  (hash-table-set! *runremote* run-id start-res)
+			  (debug:print-info 0 "connected to " (http-transport:server-dat-make-url start-res)))
 			  start-res)
 			(if (member remaining-tries '(2 5))
 			    (begin    ;; login failed
-			      (debug:print 25 "INFO: client:setup start-res=" start-res ", run-id=" run-id ", server-dat=" server-dat)
+			      (debug:print-info 0 "client:setup, login failed, will attempt to start server ... start-res=" start-res ", run-id=" run-id ", server-dat=" server-dat)
 			      (http-transport:close-connections run-id)
 			      (hash-table-delete! *runremote* run-id)
 			      (open-run-close tasks:server-force-clean-run-record
 					      tasks:open-db
 					      run-id 
@@ -122,20 +123,21 @@
 			      (thread-sleep! 10) ;; give server a little time to start up
 			      (client:setup run-id remaining-tries: 10)) ;; (- remaining-tries 1)))
 			    (begin
 			      (debug:print 25 "INFO: client:setup start-res=" start-res ", run-id=" run-id ", server-dat=" server-dat)
 			      (thread-sleep! 5)
-			      (client:setup run-id remaining-tries: (- remaining-tries 1))))))
-		  (begin    ;; no server registered
-		    (if (eq? remaining-tries 2)
-			(begin
-			  ;; (open-run-close tasks:server-clean-out-old-records-for-run-id tasks:open-db run-id " client:setup (server-dat=#f)")
-			  (client:setup run-id remaining-tries: 10))
-			(begin
-			  (thread-sleep! 2) 
-			  (debug:print 25 "INFO: client:setup start-res (not defined here), run-id=" run-id ", server-dat=" server-dat)
-			  (if (< (open-run-close tasks:num-in-available-state tasks:open-db run-id) 3)
+			      (client:setup run-id remaining-tries: (- remaining-tries 1)))))
+		  (begin    ;; no server registered
+		    (if (member remaining-tries '(2))
+			(begin
+			  (debug:print-info 0 "no server registered, remaining-tries=" remaining-tries ", try running client:setup again")
+			  ;; (open-run-close tasks:server-clean-out-old-records-for-run-id tasks:open-db run-id " client:setup (server-dat=#f)")
+			  (client:setup run-id remaining-tries: remaining-tries))
+			(let ((num-available (open-run-close tasks:num-in-available-state tasks:open-db run-id)))
+			  (thread-sleep! 2) 
+			  (debug:print-info 0 "client:setup, no server registered, remaining-tries=" remaining-tries " num-available=" num-available)
+			  (if (< num-available 2)
 			      (begin
 				;; (open-run-close tasks:server-clean-out-old-records-for-run-id tasks:open-db run-id " client:setup (server-dat=#f)")
 				(server:try-running run-id)))
 			  (thread-sleep! 10) ;; give server a little time to start up
 			  (client:setup run-id remaining-tries: (- remaining-tries 1)))))))))))