@@ -63,15 +63,15 @@
 ;; S E R V E R
 ;;======================================================================
 
 (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))
+  (let* ((start-port      (portlogger:open-run-close portlogger:find-port area-dat))
 	 (server-thread   (make-thread (lambda ()
 					 (nmsg-transport:try-start-server dbstruct run-id start-port server-id))
 				       "server thread"))
-	 (tdbdat          (tasks:open-db)))
+	 (tdbdat          (tasks:open-db area-dat)))
     (thread-start! server-thread)
     (thread-sleep! 0.1)
     (if (nmsg-transport:ping hostn start-port timeout: 2 expected-key: (current-process-id))
 	(let ((interface (if (equal? hostn "-")(get-host-name) hostn)))
 	  (tasks:server-set-interface-port (db:delay-if-busy tdbdat) server-id interface start-port)
@@ -86,11 +86,11 @@
 	  (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)
+	      (portlogger:open-run-close portlogger:set-failed area-dat start-port)
 	      (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))))))
 
@@ -106,11 +106,11 @@
 	(loop (nn-recv repsoc))))))
 
 ;; all routes though here end in exit ...
 ;;
 (define (nmsg-transport:launch run-id area-dat)
-  (let* ((tdbdat   (tasks:open-db))
+  (let* ((tdbdat   (tasks:open-db area-dat))
 	 (dbstruct (db:setup run-id))
 	 (hostn    (or (args:get-arg "-server") "-")))
     (set! *run-id*   run-id)
     (set! *inmemdb* dbstruct)
     ;; with nbfake daemonize isn't really needed
@@ -120,21 +120,21 @@
     ;;       (daemon:ize)
     ;;       (if *alt-log-file* ;; we should re-connect to this port, I think daemon:ize disrupts it
     ;;           (begin
     ;;     	(current-error-port *alt-log-file*)
     ;;     	(current-output-port *alt-log-file*)))))
-    (if (server:check-if-running run-id)
+    (if (server:check-if-running run-id area-dat)
 	(begin
 	  (debug:print-info 0 "Server for run-id " run-id " already running")
 	  (exit 0)))
     (let loop ((server-id (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id))
 	       (remtries  4))
       (if (not server-id)
 	  (if (> remtries 0)
 	      (begin
 		(thread-sleep! 2)
-		(if (not (server:check-if-running run-id))
+		(if (not (server:check-if-running run-id area-dat))
 		    (loop (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id)
 			  (- remtries 1))
 		    (begin
 		      (debug:print-info 0 "Another server took the slot, exiting")
 		      (exit 0))))
@@ -271,11 +271,11 @@
                                 (thread-sleep! 0.5)
                                 (loop))))))
          (iface       (car server-info))
          (port        (cadr server-info))
          (last-access 0)
-	 (tdbdat      (tasks:open-db))
+	 (tdbdat      (tasks:open-db area-dat))
 	 (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