@@ -62,153 +62,222 @@
     ;;======================================================================
     ;; ** set-tests-state-status
     (rpc:publish-procedure!
      'rdb:set-tests-state-status 
      (lambda (run-id testnames currstate currstatus newstate newstatus)
+       (set! *last-db-access* (current-seconds))
        (db:set-tests-state-status db run-id testnames currstate currstatus newstate newstatus)))
 
     (rpc:publish-procedure!
      'rdb:teststep-set-status!
-     (lambda (run-id test-name teststep-name state-in status-in item-path comment logfile)
-       (db:teststep-set-status! db run-id test-name teststep-name state-in status-in item-path comment logfile)))
+     (lambda (test-id teststep-name state-in status-in item-path comment logfile)
+       (set! *last-db-access* (current-seconds))
+       (db:teststep-set-status! db test-id teststep-name state-in status-in item-path comment logfile)))
 
     (rpc:publish-procedure!
      'rdb:test-update-meta-info
      (lambda (run-id testname item-path minutes cpuload diskfree tmpfree)
+       (set! *last-db-access* (current-seconds))
        (db:test-update-meta-info db run-id testname item-path minutes cpuload diskfree tmpfree)))
      
     (rpc:publish-procedure!
      'rdb:test-set-state-status-by-run-id-testname
      (lambda (run-id test-name item-path status state)
+       (set! *last-db-access* (current-seconds))
        (db:test-set-state-status-by-run-id-testname db run-id test-name item-path status state)))
 
     (rpc:publish-procedure!
      'rdb:csv->test-data 
      (lambda (test-id csvdata)
-       (db:csv->data db test-id csvdata)))
+       (set! *last-db-access* (current-seconds))
+       (db:csv->test-data db test-id csvdata)))
 
     (rpc:publish-procedure!
      'rdb:roll-up-pass-fail-counts
      (lambda (run-id test-name item-path status)
+       (set! *last-db-access* (current-seconds))
        (db:roll-up-pass-fail-counts db run-id test-name item-path status)))
 
     (rpc:publish-procedure!
      'rdb:test-set-comment 
      (lambda (run-id test-name item-path comment)
+       (set! *last-db-access* (current-seconds))
        (db:test-set-comment db run-id test-name item-path comment)))
     
     (rpc:publish-procedure!
      'rdb:test-set-log!
-     (lambda (run-id test-name item-path logf)
-       (db:test-set-log! db run-id test-name item-path logf)))
+     (lambda (test-id logf)
+       (set! *last-db-access* (current-seconds))
+       (db:test-set-log! db test-id logf)))
     
     (rpc:publish-procedure!
-     'rpc:get-test-data-by-id
+     'rdb:get-test-data-by-id
      (lambda (test-id)
+       (set! *last-db-access* (current-seconds))
        (db:get-test-data-by-id db test-id)))
 
     (rpc:publish-procedure!
      'serve:get-toppath
      (lambda ()
+       (set! *last-db-access* (current-seconds))
        *toppath*))
 
     (rpc:publish-procedure!
      'serve:login
      (lambda (toppath)
+       (set! *last-db-access* (current-seconds))
        (if (equal? *toppath* toppath)
 	   (begin
 	     (debug:print 2 "INFO: login successful")
 	     #t)
 	   #f)))	     
     
     (rpc:publish-procedure!
      'rdb:get-runs
      (lambda (runnamepatt numruns startrunoffset keypatts)
+       (set! *last-db-access* (current-seconds))
        (db:get-runs db runnamepatt numruns startrunoffset keypatts)))
 
     (rpc:publish-procedure!
      'rdb:get-tests-for-run 
      (lambda (run-id testpatt itempatt states statuses)
+       (set! *last-db-access* (current-seconds))
        (db:get-tests-for-run db run-id testpatt itempatt states statuses)))
 
     (rpc:publish-procedure!
      'rdb:get-keys
      (lambda ()
+       (set! *last-db-access* (current-seconds))
        (db:get-keys db)))
 
     (rpc:publish-procedure!
      'rdb:get-num-runs
      (lambda (runpatt)
+       (set! *last-db-access* (current-seconds))
        (db:get-num-runs db runpatt)))
 
     (rpc:publish-procedure!
      'rdb:test-set-state-status-by-id
      (lambda (test-id newstate newstatus newcomment)
+       (set! *last-db-access* (current-seconds))
        (db:test-set-state-status-by-id db test-id newstate newstatus newcomment)))
 
     (rpc:publish-procedure!
      'rdb:get-key-val-pairs
      (lambda (run-id)
+       (set! *last-db-access* (current-seconds))
        (db:get-key-val-pairs db run-id)))
 
     (rpc:publish-procedure!
      'rdb:get-key-vals
      (lambda (run-id)
+       (set! *last-db-access* (current-seconds))
        (db:get-key-vals db run-id)))
 
     (rpc:publish-procedure!
      'rdb:testmeta-get-record
      (lambda (run-id)
+       (set! *last-db-access* (current-seconds))
        (db:testmeta-get-record db run-id)))
 
     (rpc:publish-procedure!
      'rdb:get-test-data-by-id
      (lambda (test-id)
+       (set! *last-db-access* (current-seconds))
        (db:get-test-data-by-id db test-id)))
 
     (rpc:publish-procedure!
      'rdb:get-run-info
      (lambda (run-id)
+       (set! *last-db-access* (current-seconds))
        (db:get-run-info db run-id)))
 
     (rpc:publish-procedure!
      'rdb:get-steps-for-test
      (lambda (test-id)
+       (set! *last-db-access* (current-seconds))
        (db:get-steps-for-test db test-id)))
 
     (rpc:publish-procedure!
      'rdb:get-steps-table
      (lambda (test-id)
+       (set! *last-db-access* (current-seconds))
        (db:get-steps-table db test-id)))
 
     (rpc:publish-procedure!
      'rdb:read-test-data
      (lambda (test-id categorypatt)
+       (set! *last-db-access* (current-seconds))
        (db:read-test-data db test-id categorypatt)))
 
     (rpc:publish-procedure!
      'rdb:get-test-info
      (lambda (run-id testname item-path)
+       (set! *last-db-access* (current-seconds))
        (db:get-test-info db  run-id testname item-path)))
 
     (rpc:publish-procedure!
      'rdb:delete-test-records
      (lambda (test-id)
+       (set! *last-db-access* (current-seconds))
        (db:delete-test-records db test-id)))
 
     (rpc:publish-procedure!
      'rtests:register-test
      (lambda (run-id test-name item-path)
+       (set! *last-db-access* (current-seconds))
        (tests:register-test db run-id test-name item-path)))
 
+    (rpc:publish-procedure!
+     'rdb:test-data-rollup
+     (lambda (test-id status)
+       (set! *last-db-access* (current-seconds))
+       (db:test-data-rollup db test-id status)))
+    
+    (rpc:publish-procedure!
+     'rtests:test-set-status!
+     (lambda (test-id state status comment dat)
+       (set! *last-db-access* (current-seconds))
+       (test-set-status! db test-id state status comment dat)))
+
+    (rpc:publish-procedure!
+     'rtests:test-set-toplog!
+     (lambda (run-id test-name logf)
+        (set! *last-db-access* (current-seconds))
+        (test-set-toplog! db run-id test-name logf)))
+
+    ;;======================================================================
+    ;; end of publish-procedure section
+    ;;======================================================================
+
     (set! *rpc:listener* rpc:listener)
     (on-exit (lambda ()
 	       (sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER' and val=?;" host:port)
 	       (sqlite3:finalize! db)))
     (thread-start! th1)
     (thread-start! th2)
-    (thread-join!  th2))) ;; rpc:server)))
+    ;; (thread-join!  th2)
+    ;; return th2 for the calling process to do a join with 
+    th2
+    )) ;; rpc:server)))
+
+(define (server:keep-running db)
+  ;; if none running or if > 20 seconds since 
+  ;; server last used then start shutdown
+  (let loop ((count 0))
+    (thread-sleep! 20) ;; no need to do this very often
+    (let ((numrunning (db:get-count-tests-running db)))
+      (if (or (not (> numrunning 0))
+	      (> *last-db-access* (+ (current-seconds) 20)))
+	  (begin
+	    (debug:print 0 "INFO: Starting to shutdown the server side")
+	    (sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER'"); ;;  AND val like ?;"
+			  ;; host:port) ;; need to delete only *my* server entry (future use)
+	    (thread-sleep! 10)
+	    (debug:print 0 "INFO: Server shutdown complete. Exiting")
+	    (exit))))
+    (loop (+ 1 count))))
 
 (define (server:find-free-port-and-open port)
   (handle-exceptions
    exn
    (begin
@@ -217,11 +286,13 @@
    (rpc:default-server-port port)
    (tcp-listen (rpc:default-server-port))))
 
 (define (server:client-setup db)
   (if *runremote*
-      (debug:print 0 "ERROR: Attempt to connect to server but already connected")
+      (begin
+	(debug:print 0 "ERROR: Attempt to connect to server but already connected")
+	#f)
       (let* ((hostinfo (db:get-var db "SERVER"))
 	     (hostdat  (if hostinfo (string-split hostinfo ":")))
 	     (host     (if hostinfo (car hostdat)))
 	     (port     (if (and hostinfo (> (length hostdat) 1))(cadr hostdat) #f)))
 	(if (and port