Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -109,15 +109,17 @@
 ;;     (filedb:get-path db id)))
 
 ;; This routine creates the db. It is only called if the db is not already opened
 ;; 
 (define (db:open-rundb dbstruct run-id) ;;  (conc *toppath* "/megatest.db") (car *configinfo*)))
-  (let ((rdb (dbr:dbstruct-get-inmem dbstruct))) ;; (dbr:dbstruct-get-runrec dbstruct run-id 'inmem)))
+  (let* ((local  (dbr:dbstruct-get-local dbstruct))
+	 (rdb    (if local
+		     (dbr:dbstruct-get-localdb dbstruct run-id)
+		     (dbr:dbstruct-get-inmem dbstruct)))) ;; (dbr:dbstruct-get-runrec dbstruct run-id 'inmem)))
     (if rdb
 	rdb
-	(let* ((local        (dbr:dbstruct-get-local dbstruct))
-	       (toppath      (dbr:dbstruct-get-path  dbstruct))
+	(let* ((toppath      (dbr:dbstruct-get-path  dbstruct))
 	       (dbpath       (conc toppath "/db/" run-id ".db"))
 	       (dbexists     (file-exists? dbpath))
 	       (inmem        (if local #f (db:open-inmem-db)))
 	       (refdb        (if local #f (db:open-inmem-db)))
 	       (db           (sqlite3:open-database dbpath))
@@ -136,11 +138,11 @@
 		(sqlite3:execute db "PRAGMA synchronous = 1;"))) ;; was 0 but 0 is a gamble
 	  (dbr:dbstruct-set-rundb! dbstruct db)
 	  (dbr:dbstruct-set-inuse! dbstruct #t)
 	  (if local
 	      (begin
-		(dbr:dbstruct-set-inmem! dbstruct db) ;; direct access ...
+		(dbr:dbstruct-set-localdb! dbstruct run-id db) ;; (dbr:dbstruct-set-inmem! dbstruct db) ;; direct access ...
 		db)
 	      (begin
 		(dbr:dbstruct-set-inmem! dbstruct inmem)
 		(db:sync-tables db:sync-tests-only db inmem)
 		(dbr:dbstruct-set-refdb! dbstruct refdb)
@@ -238,14 +240,21 @@
 ;; close all opened run-id dbs
 (define (db:close-all dbstruct)
   ;; finalize main.db
   (db:sync-touched dbstruct force-sync: #t)
   (sqlite3:finalize! (db:get-db dbstruct #f))
-  (let ((rundb (dbr:dbstruct-get-rundb dbstruct)))
-    (if (sqlite3:database? rundb)
-	(sqlite3:finalize! rundb)
-	(debug:print 0 "WARNING: attempting to close databases but got " rundb " instead of a database"))))
+  (let* ((local (dbr:dbstruct-get-local dbstruct))
+	 (rundb (dbr:dbstruct-get-rundb dbstruct)))
+    (if local
+	(for-each
+	 (lambda (db)
+	   (if (sqlite3:database? db)
+	       (sqlite3:finalize! db)))
+	 (hash-table-values (dbr:dbstruct-get-locdbs dbstruct)))
+	(if (sqlite3:database? rundb)
+	    (sqlite3:finalize! rundb)
+	    (debug:print 0 "WARNING: attempting to close databases but got " rundb " instead of a database")))))
 
 (define (db:open-inmem-db)
   (let* ((db      (sqlite3:open-database ":memory:"))
 	 (handler   (make-busy-timeout 3600)))
     (db:initialize-run-id-db db)

Index: db_records.scm
==================================================================
--- db_records.scm
+++ db_records.scm
@@ -24,10 +24,11 @@
 (define-inline (dbr:dbstruct-get-mtime   vec)    (vector-ref  vec 6))
 (define-inline (dbr:dbstruct-get-rtime   vec)    (vector-ref  vec 7))
 (define-inline (dbr:dbstruct-get-stime   vec)    (vector-ref  vec 8))
 (define-inline (dbr:dbstruct-get-inuse   vec)    (vector-ref  vec 9))
 (define-inline (dbr:dbstruct-get-refdb   vec)    (vector-ref  vec 10))
+(define-inline (dbr:dbstruct-get-locdbs  vec)    (vector-ref  vec 11))
 
 (define-inline (dbr:dbstruct-set-main!   vec val)(vector-set! vec 0 val))
 (define-inline (dbr:dbstruct-set-strdb!  vec val)(vector-set! vec 1 val))
 (define-inline (dbr:dbstruct-set-path!   vec val)(vector-set! vec 2 val))
 (define-inline (dbr:dbstruct-set-local!  vec val)(vector-set! vec 3 val))
@@ -36,19 +37,27 @@
 (define-inline (dbr:dbstruct-set-mtime!  vec val)(vector-set! vec 6 val))
 (define-inline (dbr:dbstruct-set-rtime!  vec val)(vector-set! vec 7 val))
 (define-inline (dbr:dbstruct-set-stime!  vec val)(vector-set! vec 8 val))
 (define-inline (dbr:dbstruct-set-inuse!  vec val)(vector-set! vec 9 val))
 (define-inline (dbr:dbstruct-set-refdb!  vec val)(vector-set! vec 10 val))
+(define-inline (dbr:dbstruct-set-locdbs! vec val)(vector-set! vec 11 val))
 
 ;; constructor for dbstruct
 ;;
 (define (make-dbr:dbstruct #!key (path #f)(local #f))
-  (let ((v (make-vector 11 #f)))
+  (let ((v (make-vector 12 #f)))
     (dbr:dbstruct-set-path! v path)
     (dbr:dbstruct-set-local! v local)
+    (dbr:dbstruct-set-locdbs! v (make-hash-table))
     v))
 
+(define (dbr:dbstruct-get-localdb v run-id)
+  (hash-table-ref/default (dbr:dbstruct-get-locdbs v) run-id #f))
+
+(define (dbr:dbstruct-set-localdb! v run-id db)
+  (hash-table-set! (dbr:dbstruct-get-locdbs v) run-id db))
+
 ;; ;; get and set main db
 ;; (define-inline (dbr:dbstruct-get-main  vec)    (vector-ref vec 0))
 ;; (define-inline (dbr:dbstruct-set-main! vec db)(vector-set! vec 0 db))
 ;; ;; get the runs hash
 ;; (define-inline (dbr:dbstruct-get-dbhash vec) (vector-ref vec 1))

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -305,13 +305,14 @@
     (handle-exceptions
      exn
      (begin
        ;; TODO: Send this output to a log file so it isn't lost when running as daemon
        (print "ERROR IN http-transport:client-send-receive " ((condition-property-accessor 'exn 'message) exn))
-       (server:ensure-running run-id)
        (if (> numretries 0)
-	   (http-transport:client-api-send-receive run-id serverdat cmd params numretries: (- numretries 1))))
+	   (begin
+	     (if (> (random 100) 80)(server:ensure-running run-id)) ;; every so often try starting a server
+	     (http-transport:client-api-send-receive run-id serverdat cmd params numretries: (- numretries 1)))))
      (begin
        (debug:print-info 11 "fullurl=" fullurl "\n")
        ;; set up the http-client here
        (max-retry-attempts 5)
        ;; consider all requests indempotent