Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -242,19 +242,28 @@
 ;;
 (define (common:rotate-logs)
   (if (not (directory-exists? "logs"))(create-directory "logs"))
   (directory-fold 
    (lambda (file rem)
-     (if (and (string-match "^.*.log" file)
-	      (> (file-size (conc "logs/" file)) 200000))
-	 (let ((gzfile (conc "logs/" file ".gz")))
-	   (if (file-exists? gzfile)
-	       (begin
-		 (debug:print-info 0 *default-log-port* "removing " gzfile)
-		 (delete-file gzfile)))
-	   (debug:print-info 0 *default-log-port* "compressing " file)
-	   (system (conc "gzip logs/" file)))))
+     (let* ((fullname (conc "logs/" file))
+            (file-age (- (current-seconds)(file-modification-time fullname))))
+       (if (or (and (string-match "^.*.log" file)
+  	          (> (file-size (conc "logs/" file)) 200000))
+               (and (string-match "^server-.*.log" file)
+                    (> (- (current-seconds) (file-modification-time (conc "logs/" file))(* 8 60 60 60)))))
+  	   (let ((gzfile (conc "logs/" file ".gz")))
+  	     (if (file-exists? gzfile)
+  	         (begin
+  	  	   (debug:print-info 0 *default-log-port* "removing " gzfile)
+  		   (delete-file gzfile)))
+  	     (debug:print-info 0 *default-log-port* "compressing " file)
+  	     (system (conc "gzip logs/" file)))
+       (if (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600))
+           (handle-exceptions
+	     exn
+             #f
+             (delete-file fullname)))))) 
    '()
    "logs"))
 
 ;; Force a megatest cleanup-db if version is changed and skip-version-check not specified
 ;;

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -219,13 +219,13 @@
      (filter (lambda (rec)
 	       (let ((start-time (list-ref rec 3))
 		     (mod-time   (list-ref rec 0)))
 		 ;; (print "start-time: " start-time " mod-time: " mod-time)
 		 (and start-time mod-time
-		      (> (- now start-time) 1)    ;; been running at least 1 seconds
+		      (> (- now start-time) 0)    ;; been running at least 0 seconds
 		      (< (- now mod-time)   16)   ;; still alive - file touched in last 16 seconds
-		      (< (- now start-time) 3600) ;; under one hour running time
+		      (< (- now start-time) (string->number (or (configf:lookup *configdat* "server" "runtime") "3600"))) ;; under one hour running time
 		      )))
 	     srvlst)
      (lambda (a b)
        (< (list-ref a 3)
 	  (list-ref b 3))))))
@@ -264,11 +264,11 @@
   (let ((give-up-time (+ (current-seconds) timeout)))
     (let loop ((server-url (server:check-if-running areapath)))
       (if (or server-url
 	      (> (current-seconds) give-up-time))
 	  server-url
-	  (let ((num-ok (server:get-best (server:get-list areapath))))
+	  (let ((num-ok (length (server:get-best (server:get-list areapath)))))
 	    (if (< num-ok 2) ;; if there are no decent candidates for servers then try starting a new one
 		(server:kind-run areapath))
 	    (thread-sleep! 5)
 	    (loop (server:check-if-running areapath)))))))