@@ -61,11 +61,11 @@
 
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
 
-(define (nmsg-transport:run dbstruct hostn run-id server-id #!key (retrynum 1000))
+(define (nmsg-transport:run dbstruct area-dat hostn run-id server-id #!key (retrynum 1000))
   (debug:print 2 "Attempting to start the server ...")
   (let* ((start-port      (portlogger:open-run-close portlogger:find-port))
 	 (server-thread   (make-thread (lambda ()
 					 (nmsg-transport:try-start-server dbstruct run-id start-port server-id))
 				       "server thread"))
@@ -79,19 +79,19 @@
 	  (set! *server-info* (list hostn start-port)) ;; probably not needed anymore? currently used by keep-running
 	  (thread-sleep! 3) ;; give some margin for queries to complete before switching from file based access to server based access
 	  ;; (set! *inmemdb*  dbstruct)
 	  (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "running")
 	  (thread-start! (make-thread
-			  (lambda ()(nmsg-transport:keep-running server-id run-id))
+			  (lambda ()(nmsg-transport:keep-running server-id run-id area-dat))
 			  "keep running"))
 	  (thread-join! server-thread))
 	(if (> retrynum 0)
 	    (begin
 	      (debug:print 0 "WARNING: Failed to connect to server (self) on host " hostn ":" start-port ", trying again.")
 	      (tasks:server-delete-record (db:delay-if-busy tdbdat) server-id "failed to start, never received server alive signature")
 	      (portlogger:open-run-close portlogger:set-failed start-port)
-	      (nmsg-transport:run dbstruct hostn run-id server-id))
+	      (nmsg-transport:run dbstruct area-dat hostn run-id server-id))
 	    (begin
 	      (debug:print 0 "ERROR: could not find an open port to start server on. Giving up")
 	      (exit 1))))))
 
 (define (nmsg-transport:try-start-server dbstruct run-id portnum server-id)
@@ -105,11 +105,11 @@
 	  (nn-send repsoc (db:obj->string result  transport: 'nmsg)))
 	(loop (nn-recv repsoc))))))
 
 ;; all routes though here end in exit ...
 ;;
-(define (nmsg-transport:launch run-id)
+(define (nmsg-transport:launch run-id area-dat)
   (let* ((tdbdat   (tasks:open-db))
 	 (dbstruct (db:setup run-id))
 	 (hostn    (or (args:get-arg "-server") "-")))
     (set! *run-id*   run-id)
     (set! *inmemdb* dbstruct)
@@ -142,11 +142,11 @@
 		;; since we didn't get the server lock we are going to clean up and bail out
 		(debug:print-info 2 "INFO: server pid=" (current-process-id) ", hostname=" (get-host-name) " not starting due to other candidates ahead in start queue")
 		(tasks:server-delete-records-for-this-pid (db:delay-if-busy tdbdat) " http-transport:launch")
 		))
 	  ;; locked in a server id, try to start up
-	  (nmsg-transport:run dbstruct hostn run-id server-id))
+	  (nmsg-transport:run dbstruct area-dat hostn run-id server-id))
       (set! *didsomething* #t)
       (exit))))
 
 ;;======================================================================
 ;; S E R V E R   U T I L I T I E S 
@@ -252,11 +252,11 @@
 		 (make-property-condition 'timeout 'message "nmsg-transport:client-api-send-receive-raw timed out talking to server"))))))
 
 ;; run nmsg-transport:keep-running in a parallel thread to monitor that the db is being 
 ;; used and to shutdown after sometime if it is not.
 ;;
-(define (nmsg-transport:keep-running server-id run-id)
+(define (nmsg-transport:keep-running server-id run-id area-dat)
   ;; if none running or if > 20 seconds since 
   ;; server last used then start shutdown
   ;; This thread waits for the server to come alive
   (let* ((server-info (let loop ()
                         (let ((sdat #f))
@@ -272,11 +272,11 @@
                                 (loop))))))
          (iface       (car server-info))
          (port        (cadr server-info))
          (last-access 0)
 	 (tdbdat      (tasks:open-db))
-	 (server-timeout (let ((tmo (configf:lookup  *configdat* "server" "timeout")))
+	 (server-timeout (let ((tmo (configf:lookup  (megatest:area-configdat area-dat) "server" "timeout")))
 			   (if (and (string? tmo)
 				    (string->number tmo))
 			       (* 60 60 (string->number tmo))
 			       ;; (* 3 24 60 60) ;; default to three days
 			       (* 60 1)         ;; default to one minute