Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -268,11 +268,12 @@
 ;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
 ;;   we start the server if not running else start the client thread
 ;;======================================================================
 
 (if (args:get-arg "-server")
-    (let ((transport (args:get-arg "-transport" "http")))
+    (let ((transport (or "zmq" ;; (config-lookup *configdat* "server" "transport")
+			 (args:get-arg "-transport" "http"))))
       (debug:print 2 "Launching server using transport " transport)
       (server:launch (string->symbol transport))))
 
 (if (args:get-arg "-list-servers")
 	;; (args:get-arg "-kill-server"))

Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ tests/fullrun/megatest.config
@@ -16,10 +16,12 @@
 # Throttle roughly scales the db access milliseconds to seconds delay
 throttle 0.2
 # Max retries allows megatest to re-check that a tests status has changed
 # as tests can have transient FAIL status occasionally
 maxretries 20
+
+[server]
 transport zmq
 
 [validvalues]
 state start end 0 1 - 2
 status pass fail n/a 0 1 running - 2

Index: zmq-transport.scm
==================================================================
--- zmq-transport.scm
+++ zmq-transport.scm
@@ -340,13 +340,13 @@
         (mutex-lock! *heartbeat-mutex*)
         (set! last-access *last-db-access*)
         (mutex-unlock! *heartbeat-mutex*)
         (if (> (+ last-access
                   ;; (* 50 60 60)    ;; 48 hrs
-                  ;; 60              ;; one minute
+                  60              ;; one minute
                   ;; (* 60 60)       ;; one hour
-                  (* 45 60)          ;; 45 minutes, until the db deletion bug is fixed.
+                  ;; (* 45 60)           ;; 45 minutes, until the db deletion bug is fixed.
                   )
                (current-seconds))
             (begin
               (debug:print-info 2 "Server continuing, seconds since last db access: " (- (current-seconds) last-access))
               (loop 0))