Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -4612,11 +4612,15 @@
 					(begin
 					  (sqlite3:interrupt! db)
 					  (sqlite3:finalize! db #t)
 					  ;; (vector-set! *task-db* 0 #f)
 					  (set! *task-db* #f)))))
-                              (http-client#close-all-connections!)
+			      (if (and (not (args:get-arg "-server"))
+				       *runremote*)
+				  (begin
+				    (debug:print-info 0 *default-log-port* "Closing all client connections...")
+				    (http-client#close-all-connections!)))
                               ;; (if (and *runremote*
                               ;;          (remote-conndat *runremote*))
                               ;;     (begin
                               ;;       (http-client#close-all-connections!))) ;; for http-client
                               (if (not (eq? *default-log-port* (current-error-port)))

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -285,10 +285,11 @@
                                                     (begin
                                                       (debug:print 0 *default-log-port* "WARNING: failure in with-input-from-request to " fullurl ".")
                                                       (debug:print 0 *default-log-port* " message: " msg ", exn=" exn)
                                                       (debug:print 0 *default-log-port* " cmd: " cmd " params: " params " key:" (or server-id "thekey"))
                                                       (debug:print 0 *default-log-port* " call-chain: " call-chain)))
+						;; what if another thread is communicating ok? Can't happen due to mutex
 						(set! *runremote* #f)
 						(set! runremote #f)
 						;; (if runremote
 						;;    (remote-conndat-set! runremote #f))
 						;; Killing associated server to allow clean retry.")
@@ -391,11 +392,12 @@
 	(debug:print-error 0 *default-log-port* "call to http-transport:server-dat-update-last-access with non-vector!!"))))
 
 ;;
 ;; connect
 ;;
-(define (http-transport:client-connect iface port server-id) 
+(define (http-transport:client-connect iface port server-id)
+  (debug:print-info 0 *default-log-port* "Connecting to client at "iface":"port", with server-id "server-id)
   (let* ((api-url      (conc "http://" iface ":" port "/api"))
 	 (api-uri      (uri-reference (conc "http://" iface ":" port "/api")))
 	 (api-req      (make-request method: 'POST uri: api-uri))
 	 (server-dat   (vector iface port api-uri api-url api-req (current-seconds) server-id)))
     server-dat))

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -196,11 +196,14 @@
 
      ;;DOT CASE6 [label="init\nremote"];
      ;;DOT MUTEXLOCK -> CASE6 [label="on homehost,\nwrite query,\nhave server,\ncan't reach it"]; {rank=same "case 6" CASE6};
      ;;DOT CASE6 -> "rmt:send-receive";
      ;; on homehost and this is a write, we already have a server, but server has died
-     ((and (cdr (remote-hh-dat runremote))           ;; on homehost
+
+     ;; reinstate this keep-alive section but inject a time condition into the (add ...
+     
+     #;((and (cdr (remote-hh-dat runremote))           ;; on homehost
            (not (member cmd api:read-only-queries))  ;; this is a write
            (remote-server-url runremote)             ;; have a server
            (not (server:ping (remote-server-url runremote) (remote-server-id runremote))))  ;; server has died. NOTE: this is not a cheap call! Need better approach.
       (debug:print 0 *default-log-port* "WARNING: server appears to have died, trying to reconnect, case 6")
       (http-transport:close-connections area-dat: runremote) ;; make sure to clean up