Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -117,11 +117,11 @@
 (defstruct servdat
   (host #f)
   (port #f)
   (uuid #f)
   (dbfile #f)
-  (uconn   #f) ;; this is the listener
+  (uconn   #f) ;; this is the listener *FOR THIS PROCESS*
   (mode    #f)
   (status 'starting)
   (trynum 0) ;; count the number of ports we've tried
   (conns  (make-hash-table)) ;; apath/dbname => conndat
   ) 
@@ -170,22 +170,20 @@
 ;; else setup a connection
 ;;
 ;; if that fails, return '(#f "some reason") ;; NB// convert to raising an exception
 ;;
 (define (rmt:get-conn remdat apath dbname)
-  (let* ((fullname (db:dbname->path apath dbname))
-	 (conn     (hash-table-ref/default (servdat-conns remdat) fullname #f)))
-    (if (and conn
-	     (< (current-seconds) (conndat-expires conn)))
-	conn
-	#f ;; TODO - convert this to a refresh for the given db? (server could have moved)
-	)))
-
+  (let* ((fullname (db:dbname->path apath dbname)))
+    (hash-table-ref/default (servdat-conns remdat) fullname #f)))
+
+(define (rmt:drop-conn remdat apath dbname)
+  (let* ((fullname (db:dbname->path apath dbname)))
+    (hash-table-delete! (servdat-conns remdat) fullname)))
+  
 (define (rmt:find-main-server uconn apath dbname)
   (let* ((pktsdir     (get-pkts-dir apath))
 	 (all-srvpkts (get-all-server-pkts pktsdir *srvpktspec*))
-	 ;; (dbpath      (conc apath "/" dbname))
 	 (viable-srvs (get-viable-servers all-srvpkts dbname)))
     (get-the-server uconn apath viable-srvs)))
 
 
 (define *connstart-mutex* (make-mutex))
@@ -197,13 +195,13 @@
 ;; connections for other servers happens by requesting from main
 ;;
 ;; TODO: This is unnecessarily re-creating the record in the hash table
 ;;
 (define (rmt:open-main-connection remdat apath)
-  (let* ((fullpath (db:dbname->path apath "/.db/main.db"))
+  (let* ((fullpath (db:dbname->path apath ".db/main.db"))
 	 (conns    (servdat-conns remdat))
-	 (conn     (hash-table-ref/default conns fullpath #f)) ;; TODO - create call for this
+	 (conn     (rmt:get-conn remdat apath ".db/main.db")) ;; (hash-table-ref/default conns fullpath #f)) ;; TODO - create call for this
 	 (start-rmt:run (lambda ()
 			  (let* ((th1 (make-thread (lambda ()(rmt:run (get-host-name))) "non-db mode server")))
 			    (thread-start! th1)
 			    (thread-sleep! 1)
 			    (let loop ((count 0))
@@ -225,11 +223,11 @@
 	   (< (current-seconds) (conndat-expires conn)))
       #t) ;; we are current and good to go - we'll deal elsewhere with a server that was killed or died 
      ((and conn
 	   (>= (current-seconds)(conndat-expires conn)))
       (debug:print-info 0 *default-log-port* "connection to "fullpath" server expired. Reconnecting.")
-      (hash-table-delete! conns fullpath) ;; clean up
+      (rmt:drop-conn remdat apath ".db/main.db") ;; (hash-table-delete! conns fullpath) ;; clean up
       (rmt:open-main-connection remdat apath))
      (else
       ;; Below we will find or create and connect to main
       (let* ((dbname         (db:run-id->dbname #f))
 	     (the-srv        (rmt:find-main-server myconn apath dbname))
@@ -357,15 +355,21 @@
 ;; sometime in the future
 ;;
 (define (rmt:send-receive-real sinfo apath dbname cmd params)
   (let* ((cdat (rmt:get-conn sinfo apath dbname)))
     (assert cdat "FATAL: rmt:send-receive-real called without the needed channels opened")
-    (let* ((uconn    (servdat-uconn sinfo))
-	   (res      (send-receive uconn (conndat-hostport cdat) cmd params))) ;; payload)))
-      (if (member res '("#<unspecified>")) ;; TODO - fix this in string->sexpr
+    (let* ((uconn    (servdat-uconn sinfo)) ;; get the interface to ulex
+	   ;; then send-receive using the ulex layer to host-port stored in cdat
+	   (res      (send-receive uconn (conndat-hostport cdat) cmd params)))
+      ;; since we accessed the server we can bump the expires time up
+      (conndat-expires-set! cdat (+ (current-seconds)
+				    (server:expiration-timeout)
+				    -2)) ;; two second margin for network time misalignments etc.
+      #;(if (member res '("#<unspecified>")) ;; TODO - fix this in string->sexpr
 	  #f
-	  res))))
+      res)
+      res)))
 
 ;; db is at apath/.db/dbname, rid is an intermediary solution and will be removed
 ;; sometime in the future.
 ;;
 ;; Purpose - call the main.db server and request a server be started