Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -71,11 +71,21 @@
 				    (remote-ro-mode-set! runremote ro-mode)
 				    (remote-ro-mode-checked-set! runremote #t)
 				    ro-mode)
 				  ro-mode)))))
 
-    ;;(print "BB> readonly-mode is "readonly-mode" dbfile is "dbfile)
+     ;; ensure we have a record for our connection for given area
+     (if (not runremote)                   ;; can remove this one. should never get here.         
+	 (begin
+	   (set! *runremote* (make-remote))
+	   (set! runremote   *runremote*))) ;; new runremote will come from this on next iteration
+     ;; ensure we have a homehost record
+     (if (not (pair? (remote-hh-dat runremote)))  ;; not on homehost
+	 (thread-sleep! 0.1) ;; since we shouldn't get here, delay a little
+	 (remote-hh-dat-set! runremote (common:get-homehost)))
+
+     ;;(print "BB> readonly-mode is "readonly-mode" dbfile is "dbfile)
     (cond
      ;; give up if more than 15 attempts
      ((> attemptnum 15)
       (debug:print 0 *default-log-port* "ERROR: 15 tries to start/connect to server. Giving up.")
       (exit 1))
@@ -103,36 +113,23 @@
 	     (< (http-transport:server-dat-get-last-access (remote-conndat runremote)) expire-time)))
       (debug:print-info 0 *default-log-port* "Connection to " (remote-server-url runremote) " expired due to no accesses, forcing new connection.")
       (remote-conndat-set! runremote #f) ;; invalidate the connection, thus forcing a new connection.
       (mutex-unlock! *rmt-mutex*)
       (rmt:send-receive cmd rid params attemptnum: attemptnum))
-     ;; ensure we have a record for our connection for given area
-     ((not runremote)                  ;; can remove this one. should never get here.         
-      (set! *runremote* (make-remote)) ;; new runremote will come from this on next iteration
-      (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  1")
-      (rmt:send-receive cmd rid params attemptnum: attemptnum))
-     ;; ensure we have a homehost record
-     ((not (pair? (remote-hh-dat runremote)))  ;; not on homehost
-      (thread-sleep! 0.1) ;; since we shouldn't get here, delay a little
-      (remote-hh-dat-set! runremote (common:get-homehost))
-      (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  2")
-      (rmt:send-receive cmd rid params attemptnum: attemptnum))
      ;; on homehost and this is a read
      ((and (not (remote-force-server runremote))      ;; honor forced use of server
 	   (cdr (remote-hh-dat runremote))     ;; on homehost
            (member cmd api:read-only-queries)) ;; this is a read
       (mutex-unlock! *rmt-mutex*)
       (debug:print-info 12 *default-log-port* "rmt:send-receive, case  3")
       (rmt:open-qry-close-locally cmd 0 params))
 
      ;; on homehost and this is a write, we already have a server, but server has died
-     ((and (cdr (remote-hh-dat runremote))         ;; on homehost
+     ((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:check-if-running *toppath*)))  ;; server has died.
+           (remote-server-url runremote)             ;; have a server
+           (not (server:ping (remote-server-url runremote))))  ;; server has died. NOTE: this is not a cheap call! Need better approach.
       (set! *runremote* (make-remote))
       (mutex-unlock! *rmt-mutex*)
       (debug:print-info 12 *default-log-port* "rmt:send-receive, case  4.1")
       (rmt:send-receive cmd rid params attemptnum: attemptnum))
 

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -404,10 +404,12 @@
 	     ((NOREPLY)  #f)
 	     ((LOGIN_OK) #t)
 	     (else       #f))
 	   (loop (read-line) inl))))))
 
+;; NOT USED (well, ok, reference in rpc-transport but otherwise not used).
+;;
 (define (server:login toppath)
   (lambda (toppath)
     (set! *db-last-access* (current-seconds)) ;; might not be needed.
     (if (equal? *toppath* toppath)
 	#t