Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -652,11 +652,12 @@
 	    
 	    ;; tack on remaining records in fromdat
 	    (if (not (null? fromdat))
 		(set! fromdats (cons fromdat fromdats)))
 
-	    (debug:print-info 4 "found " totrecords " records to sync")
+	    (if (common:low-noise-print 120 "sync-records")
+		(debug:print-info 4 "found " totrecords " records to sync"))
 
 	    ;; read the target table
 	    (sqlite3:for-each-row
 	     (lambda (a . b)
 	       (hash-table-set! todat a (apply vector a b)))
@@ -695,11 +696,11 @@
 		  fromdats)
 		 (sqlite3:finalize! stmth)))
 	     (append (list todb) slave-dbs))))
 	tbls)
        (let* ((runtime      (- (current-milliseconds) start-time))
-	      (should-print (common:low-noise-print 30 "db sync" (> runtime 500)))) ;; low and high sync times treated as separate.
+	      (should-print (common:low-noise-print 120 "db sync" (> runtime 500)))) ;; low and high sync times treated as separate.
 	 (if should-print (debug:print 0 "INFO: db sync, total run time " runtime " ms"))
 	 (for-each 
 	  (lambda (dat)
 	    (let ((tblname (car dat))
 		  (count   (cdr dat)))

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -8,12 +8,12 @@
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 
 (require-extension (srfi 18) extras tcp s11n)
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
-(import (prefix sqlite3 sqlite3:))
+(use  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest) ;; sqlite3
+;; (import (prefix sqlite3 sqlite3:))
 
 (use spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing)
 
 ;; Configurations for server
 (tcp-buffer-size 2048)
@@ -357,10 +357,11 @@
   ;; if none running or if > 20 seconds since 
   ;; server last used then start shutdown
   ;; This thread waits for the server to come alive
   (debug:print-info 0 "Starting the sync-back, keep alive thread in server for run-id=" run-id)
   (let* ((tdbdat      (tasks:open-db))
+	 (server-start-time (current-seconds))
 	 (server-info (let loop ((start-time (current-seconds))
 				 (changed    #t)
 				 (last-sdat  "not this"))
                         (let ((sdat #f))
 			  (thread-sleep! 0.01)
@@ -460,25 +461,32 @@
       ;;
       ;; no_traffic, no running tests, if server 0, no running servers
       ;;
       ;; (let ((wait-on-running (configf:lookup *configdat* "server" "wait-on-running"))) ;; wait on running tasks (if not true then exit on time out)
       ;;
-      (if (and *server-run*
-	       (> (+ last-access server-timeout)
-		  (current-seconds)))
-	  (begin
-	    (debug:print-info 0 "Server continuing, seconds since last db access: " (- (current-seconds) last-access))
-	    ;;
-	    ;; Consider implementing some smarts here to re-insert the record or kill self is
-	    ;; the db indicates so
-	    ;;
-	    ;; (if (tasks:server-am-i-the-server? tdb run-id)
-	    ;;     (tasks:server-set-state! tdb server-id "running"))
-	    ;;
-	    (loop 0 server-state bad-sync-count))
-	  (http-transport:server-shutdown server-id port)))))
-
+      (let* ((hrs-since-start  (/ (- (current-seconds) server-start-time) 3600))
+	     (adjusted-timeout (if (> hrs-since-start 1)
+				   (- server-timeout (* hrs-since-start 60))  ;; subtract 60 seconds per hour
+				   server-timeout)))
+	(if (common:low-noise-print 120 "server timeout")
+	    (debug:print-info 0 "Adjusted server timeout: " adjusted-timeout))
+	(if (and *server-run*
+		 (> (+ last-access server-timeout)
+		    (current-seconds)))
+	    (begin
+	      (if (common:low-noise-print 120 "server continuing")
+		  (debug:print-info 0 "Server continuing, seconds since last db access: " (- (current-seconds) last-access)))
+	      ;;
+	      ;; Consider implementing some smarts here to re-insert the record or kill self is
+	      ;; the db indicates so
+	      ;;
+	      ;; (if (tasks:server-am-i-the-server? tdb run-id)
+	      ;;     (tasks:server-set-state! tdb server-id "running"))
+	      ;;
+	      (loop 0 server-state bad-sync-count))
+	    (http-transport:server-shutdown server-id port))))))
+  
 (define (http-transport:server-shutdown server-id port)
   (let ((tdbdat (tasks:open-db)))
     (debug:print-info 0 "Starting to shutdown the server.")
     ;; need to delete only *my* server entry (future use)
     (set! *time-to-exit* #t)