Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -8,11 +8,11 @@
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 
 (require-extension (srfi 18) extras tcp s11n)
 
-(use  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest) ;; sqlite3
+(use  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest posix-extras) ;; sqlite3
 ;; (import (prefix sqlite3 sqlite3:))
 
 (use spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing)
 
 ;; Configurations for server
@@ -367,11 +367,12 @@
 					  sdat)))))))
          (iface       (car server-info))
          (port        (cadr server-info))
          (last-access 0)
 	 (server-timeout (server:get-timeout))
-	 (server-going  #f))
+	 (server-going  #f)
+	 (server-log-file (args:get-arg "-log"))) ;; always set when we are a server
     (let loop ((count         0)
 	       (server-state 'available)
 	       (bad-sync-count 0)
 	       (start-time     (current-milliseconds)))
       ;; Use this opportunity to sync the tmp db to megatest.db
@@ -427,11 +428,13 @@
 	(cond
          ((and *server-run*
 		 (> (+ last-access server-timeout)
 		    (current-seconds)))
           (if (common:low-noise-print 120 "server continuing")
-              (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access)))
+              (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access))
+	      (let ((curr-time (current-seconds)))
+		(change-file-times server-log-file curr-time curr-time)))
           (loop 0 server-state bad-sync-count (current-milliseconds)))
          (else
           (debug:print-info 0 *default-log-port* "Server timeed out. seconds since last db access: " (- (current-seconds) last-access))
           (http-transport:server-shutdown port)))))))
 

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -253,12 +253,13 @@
   (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
-	  (begin
-	    (server:kind-run areapath)
+	  (let ((num-ok (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)))))))
 
 (define server:try-running server:run) ;; there is no more per-run servers ;; REMOVE ME. BUG.
 

ADDED   utils/lock-stats.sh
Index: utils/lock-stats.sh
==================================================================
--- /dev/null
+++ utils/lock-stats.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+while IFS=': ' read x x x x p x x i x; do
+    if ! [[ ${i}x == "x" ]];then
+	if ! $(echo $i|grep EOF >/dev/null);then
+	    fname=$(sudo find -L "/proc/$p/fd" -maxdepth 1 -inum "$i" -exec readlink {} \; -quit)
+	    if $(echo $fname | grep megatest.db > /dev/null) || \
+	       $(echo $fname | egrep '.db/\d+.db' > /dev/null);then
+		echo $fname
+	    fi
+	fi
+    fi
+done < /proc/locks