Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -53,11 +53,11 @@
 ;;
 ;; client:setup
 ;;
 ;; lookup_server, need to remove *runremote* stuff
 ;;
-(define (client:setup run-id #!key (remaining-tries 20) (failed-connects 0))
+(define (client:setup run-id #!key (remaining-tries 10) (failed-connects 0))
   (debug:print 0 "INFO: 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))
@@ -66,20 +66,20 @@
 	    (let ((start-res (http-transport:client-connect run-id ;; NB// confusion over server-dat and connection result!
 							    (car  server-dat)
 							    (cadr server-dat))))
 	      (if start-res ;; sucessful login?
 		  start-res
-		  (if (eq? remaining-tries 6)
+		  (if (eq? remaining-tries 4)
 		      (begin    ;; login failed
 			(hash-table-delete! *runremote* run-id)
 			(open-run-close tasks:server-force-clean-run-record
 			 		tasks:open-db
 			 		run-id 
 			 		(car  server-dat)
 			 		(cadr server-dat))
 			(thread-sleep! 5)
-			(client:setup run-id remaining-tries: (- remaining-tries 1)))
+			(client:setup run-id remaining-tries: 10)) ;; (- remaining-tries 1)))
 		      (begin
 			(thread-sleep! 5)
 			(client:setup run-id remaining-tries: (- remaining-tries 1))))))
 	    (let* ((server-dat (open-run-close tasks:get-server tasks:open-db run-id)))
 	      (if server-dat
@@ -86,11 +86,11 @@
 		  (let ((start-res (http-transport:client-connect run-id
 								  (tasks:hostinfo-get-interface server-dat)
 								  (tasks:hostinfo-get-port      server-dat))))
 		    (if start-res
 			start-res
-			(if (eq? remaining-tries 6)
+			(if (eq? remaining-tries 2)
 			    (begin    ;; login failed
 			      (hash-table-delete! *runremote* run-id)
 			      (open-run-close tasks:server-force-clean-run-record
 					      tasks:open-db
 					      run-id 
@@ -97,11 +97,11 @@
 					      (tasks:hostinfo-get-interface server-dat)
 					      (tasks:hostinfo-get-port      server-dat))
 			      (thread-sleep! 2)
 			      (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)))
+			      (client:setup run-id remaining-tries: 10)) ;; (- remaining-tries 1)))
 			    (begin
 			      (thread-sleep! 5)
 			      (client:setup run-id remaining-tries: (- remaining-tries 1))))))
 		  (begin    ;; no server registered
 		    (thread-sleep! 2)