Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -90,32 +90,33 @@
 	  (http-transport:server-dat-update-last-access connection-info)
 	  (if res
 	      (db:string->obj res)
 	      (let ((new-connection-info (client:setup run-id)))
 		(debug:print 0 "WARNING: Communication failed, trying call to http-transport:client-api-send-receive again.")
-		(hash-table-delete! *runremote* run-id)
+		(hash-table-delete! *runremote* run-id) ;; don't keep using the same connection
 		(rmt:send-receive cmd run-id params))))
-	(let ((max-avg-qry (string->number (or (configf:lookup *configdat* "server" "server-query-threshold") "-1"))))
+	(let ((max-avg-qry (string->number (or (configf:lookup *configdat* "server" "server-query-threshold") "10"))))
 	  (debug:print-info 4 "no server and read-only query, bypassing normal channel")
 	  ;; (if (rmt:write-frequency-over-limit? cmd run-id)(server:kind-run run-id))
-	  (let ((curr-max (rmt:get-max-query-average)))
+	  (let ((curr-max (rmt:get-max-query-average run-id)))
 	    (if (> (cdr curr-max) max-avg-qry)
 		(begin
-		  (debug:print-info 3 "Max average query, " (inexact->exact (round (cdr curr-max))) "ms (" (car curr-max) ") exceeds " max-avg-qry ", try starting server ...")
-		  (server:kind-run run-id))))
+		  (debug:print-info 0 "Max average query, " (inexact->exact (round (cdr curr-max))) "ms (" (car curr-max) ") exceeds " max-avg-qry ", try starting server ...")
+		  (server:kind-run run-id))
+		(debug:print-info 3 "Max average query, " (inexact->exact (round (cdr curr-max))) "ms (" (car curr-max) ") below " max-avg-qry ", not starting server...")))
 	  (rmt:open-qry-close-locally cmd run-id params)))))
 
-(define (rmt:update-db-stats rawcmd params duration)
+(define (rmt:update-db-stats run-id rawcmd params duration)
   (mutex-lock! *db-stats-mutex*)
   (handle-exceptions
    exn
    (begin
      (debug:print 0 "WARNING: stats collection failed in update-db-stats")
      (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
      (print "exn=" (condition->list exn))
      #f) ;; if this fails we don't care, it is just stats
-   (let* ((cmd      (if (eq? rawcmd 'general-call) (car params) rawcmd))
+   (let* ((cmd      (conc "run-id=" run-id " " (if (eq? rawcmd 'general-call) (car params) rawcmd)))
 	  (stat-vec (hash-table-ref/default *db-stats* cmd #f)))
      (if (not stat-vec)
 	 (let ((newvec (vector 0 0)))
 	   (hash-table-set! *db-stats* cmd newvec)
 	   (set! stat-vec newvec)))
@@ -134,29 +135,32 @@
 	      (sort (hash-table-keys *db-stats*)
 		    (lambda (a b)
 		      (> (vector-ref (hash-table-ref *db-stats* a) 0)
 			 (vector-ref (hash-table-ref *db-stats* b) 0)))))))
 
-(define (rmt:get-max-query-average)
+(define (rmt:get-max-query-average run-id)
   (mutex-lock! *db-stats-mutex*)
-  (let* ((cmds (hash-table-keys *db-stats*))
-	 (res  (if (null? cmds)
-		   (cons 'none 0)
-		   (let loop ((cmd (car cmds))
-			      (tal (cdr cmds))
-			      (max-cmd (car cmds))
-			      (res 0))
-		     (let* ((cmd-dat (hash-table-ref *db-stats* cmd))
-			    (tot     (vector-ref cmd-dat 0))
-			    (curravg (/ (vector-ref cmd-dat 1) (vector-ref cmd-dat 0))) ;; count is never zero by construction
-			    (currmax (max res curravg))
-			    (newmax-cmd (if (> curravg res) cmd max-cmd)))
-		       (if (null? tal)
-			   (if (> tot 10)
-			       (cons newmax-cmd currmax)
-			       (cons 'none 0))
-			   (loop (car tal)(cdr tal) newmax-cmd currmax)))))))
+  (let* ((runkey (conc "run-id=" run-id " "))
+	 (cmds   (filter (lambda (x)
+			   (substring-index runkey x))
+			 (hash-table-keys *db-stats*)))
+	 (res    (if (null? cmds)
+		     (cons 'none 0)
+		     (let loop ((cmd (car cmds))
+				(tal (cdr cmds))
+				(max-cmd (car cmds))
+				(res 0))
+		       (let* ((cmd-dat (hash-table-ref *db-stats* cmd))
+			      (tot     (vector-ref cmd-dat 0))
+			      (curravg (/ (vector-ref cmd-dat 1) (vector-ref cmd-dat 0))) ;; count is never zero by construction
+			      (currmax (max res curravg))
+			      (newmax-cmd (if (> curravg res) cmd max-cmd)))
+			 (if (null? tal)
+			     (if (> tot 10)
+				 (cons newmax-cmd currmax)
+				 (cons 'none 0))
+			     (loop (car tal)(cdr tal) newmax-cmd currmax)))))))
     (mutex-unlock! *db-stats-mutex*)
     res))
 	  
 (define (rmt:open-qry-close-locally cmd run-id params)
   (let* ((dbstruct-local (if *dbstruct-db*
@@ -168,11 +172,11 @@
 	 (db-file-path   (db:dbfile-path 0)))
     ;; (read-only      (not (file-read-access? db-file-path)))
     (let* ((start         (current-milliseconds))
 	   (res           (api:execute-requests dbstruct-local (symbol->string cmd) params))
 	   (duration      (- (current-milliseconds) start)))
-      (rmt:update-db-stats cmd params duration)
+      (rmt:update-db-stats run-id cmd params duration)
       ;; mark this run as dirty if this was a write
       (if (not (member cmd api:read-only-queries))
 	  (let ((start-time (current-seconds)))
 	    (mutex-lock! *db-multi-sync-mutex*)
 	    (if (not (hash-table-ref/default *db-local-sync* run-id #f))