Index: megatest-version.scm ================================================================== --- megatest-version.scm +++ megatest-version.scm @@ -1,7 +1,7 @@ ;; Always use two digit decimal ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00.. (declare (unit megatest-version)) -(define megatest-version 1.5425) +(define megatest-version 1.5426) Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -308,11 +308,11 @@ (let loop ((servers (open-run-close tasks:get-best-server tasks:open-db)) (trycount 0)) (if (or (not servers) (null? servers)) (begin - (if (eq? trycount 0) ;; just do the server start once + (if (even? trycount) ;; just do the server start every other time through this loop (every 8 seconds) (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"))) (system "megatest -list-servers | grep alive || megatest -server - -daemonize && sleep 3") @@ -321,13 +321,15 @@ ;; (server:launch (string->symbol (args:get-arg "-transport" "http"))))) ;; (thread-sleep! 3) ) (begin (debug:print-info 0 "Waiting for server to start") - (thread-sleep! 1))) - (loop (open-run-close tasks:get-best-server tasks:open-db) - (+ trycount 1))) + (thread-sleep! 4))) + (if (< trycount 10) + (loop (open-run-close tasks:get-best-server tasks:open-db) + (+ trycount 1)) + (debug:print 0 "WARNING: Couldn't start or find a server."))) (debug:print 0 "INFO: Server(s) running " servers) ))))) (if (or (args:get-arg "-list-servers") (args:get-arg "-stop-server"))