Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -35,14 +35,24 @@
 
 (define home (getenv "HOME"))
 (define user (getenv "USER"))
 
 ;; GLOBAL GLETCHES
-(define *db-keys* #f)
-(define *configinfo* #f)
-(define *configdat*  #f)
-(define *toppath*    #f)
+(define-record megatest:area
+  name
+  path
+  transport
+  configinfo
+  configdat
+  denoise
+  client-signature
+  remote
+  )
+
+;; (define *configinfo* #f)
+;; (define *configdat*  #f)
+;; (define *toppath*    #f)
 (define *already-seen-runconfig-info* #f)
 (define *waiting-queue*     (make-hash-table))
 (define *test-meta-updated* (make-hash-table))
 (define *globalexitstatus*  0) ;; attempt to work around possible thread issues
 (define *passnum*           0) ;; when running track calls to run-tests or similar
@@ -64,14 +74,13 @@
 (define *task-db*             #f) ;; (vector db path-to-db)
 (define *db-access-allowed*   #t) ;; flag to allow access
 (define *db-access-mutex*     (make-mutex))
 
 ;; SERVER
-(define *my-client-signature* #f)
-(define *transport-type*    'http)
-(define *transport-type*    'http)             ;; override with [server] transport http|rpc|nmsg
-(define *runremote*         (make-hash-table)) ;; if set up for server communication this will hold <host port>
+;; (define *my-client-signature* #f)
+;; (define *transport-type*    'http)             ;; override with [server] transport http|rpc|nmsg
+;; (define *runremote*         (make-hash-table)) ;; if set up for server communication this will hold <host port>
 
 (define (common:get-remote remote run-id)
   (let ((ht (or remote *runremote*)))
     (if ht
 	(hash-table-ref/default ht run-id #f)

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1445,21 +1445,19 @@
 
 ;; why get the keys from the db? why not get from the *configdat*
 ;; using keys:config-get-fields?
 
 (define (db:get-keys dbstruct)
-  (if *db-keys* *db-keys* 
-      (let ((res '()))
-	(db:with-db dbstruct #f #f
-		    (lambda (db)
-		      (sqlite3:for-each-row 
-		       (lambda (key)
-			 (set! res (cons key res)))
-		       db
-		       "SELECT fieldname FROM keys ORDER BY id DESC;")))
-	(set! *db-keys* res)
-	res)))
+  (let ((res '()))
+    (db:with-db dbstruct #f #f
+		(lambda (db)
+		  (sqlite3:for-each-row 
+		   (lambda (key)
+		     (set! res (cons key res)))
+		   db
+		   "SELECT fieldname FROM keys ORDER BY id DESC;")))
+    res))
 
 ;; look up values in a header/data structure
 (define (db:get-value-by-header row header field)
   (if (null? header) #f
       (let loop ((hed (car header))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -482,105 +482,114 @@
 	    (debug:print 2 "Output from running " fullrunscript ", pid " (vector-ref exit-info 0) " in work area " 
 			 work-area ":\n====\n exit code " (vector-ref exit-info 2) "\n" "====\n")
 	    (if (not (vector-ref exit-info 1))
 		(exit 4)))))))
 
+(define (launch:read-cached-config)
+  (if (get-environment-variable "MT_CMDINFO") ;; we are inside a test - do not reprocess configs
+      (let ((alistconfig (conc (get-environment-variable "MT_LINKTREE") "/"
+			       (get-environment-variable "MT_TARGET")   "/"
+			       (get-environment-variable "MT_RUNNAME")  "/"
+			       ".megatest.cfg")))
+	(if (file-exists? alistconfig)
+	    (list (configf:read-alist alistconfig)
+		  (get-environment-variable "MT_RUN_AREA_HOME"))
+	    #f))
+      #f)) 
+
+(define (launch:read-megatest-config toppath)
+  (let ((runname (or (args:get-arg "-runname")(args:get-arg ":runname"))))
+    (if runname (setenv "MT_RUNNAME" runname))
+    (find-and-read-config 
+     (if (args:get-arg "-config")(args:get-arg "-config") "megatest.config")
+     environ-patt: "env-override"
+     given-toppath: (get-environment-variable "MT_RUN_AREA_HOME")
+     pathenvvar: "MT_RUN_AREA_HOME")))
+
 ;; set up the very basics needed for doing anything here.
-(define (launch:setup-for-run #!key (force #f))
+(define (launch:setup-for-run area-dat #!key (force #f))
   ;; would set values for KEYS in the environment here for better support of env-override but 
   ;; have chicken/egg scenario. need to read megatest.config then read it again. Going to 
   ;; pass on that idea for now
   ;; special case
-  (if (or force (not (hash-table? *configdat*)))  ;; no need to re-open on every call
-      (begin
-	(set! *configinfo* (or (if (get-environment-variable "MT_CMDINFO") ;; we are inside a test - do not reprocess configs
-				   (let ((alistconfig (conc (get-environment-variable "MT_LINKTREE") "/"
-							    (get-environment-variable "MT_TARGET")   "/"
-							    (get-environment-variable "MT_RUNNAME")  "/"
-							    ".megatest.cfg")))
-				     (if (file-exists? alistconfig)
-					 (list (configf:read-alist alistconfig)
-					       (get-environment-variable "MT_RUN_AREA_HOME"))
-					 #f))
-				   #f) ;; no config cached - give up
-			       (let ((runname (or (args:get-arg "-runname")(args:get-arg ":runname"))))
-				 (if runname (setenv "MT_RUNNAME" runname))
-				 (find-and-read-config 
-				  (if (args:get-arg "-config")(args:get-arg "-config") "megatest.config")
-				  environ-patt: "env-override"
-				  given-toppath: (get-environment-variable "MT_RUN_AREA_HOME")
-				  pathenvvar: "MT_RUN_AREA_HOME"))))
-	(set! *configdat*  (if (car *configinfo*)(car *configinfo*) #f))
-	(set! *toppath*    (if (car *configinfo*)(cadr *configinfo*) #f))
-	(let* ((tmptransport (configf:lookup *configdat* "server" "transport"))
-	       (transport    (if tmptransport (string->symbol tmptransport) 'http)))
-	  (if (member transport '(http rpc nmsg))
-	      (set! *transport-type* transport)
-	      (begin
-		(debug:print 0 "ERROR: Unrecognised transport " transport)
-		(exit))))
-	(let ((linktree (configf:lookup *configdat* "setup" "linktree"))) ;; link tree is critical
-	  (if linktree
-	      (if (not (file-exists? linktree))
-		  (begin
-		    (handle-exceptions
-		     exn
-		     (begin
-		       (debug:print 0 "ERROR: Something went wrong when trying to create linktree dir at " linktree)
-		       (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
-		       (exit 1))
-		     (create-directory linktree #t))))
-	      (begin
-		(debug:print 0 "ERROR: linktree not defined in [setup] section of megatest.config")
-		(exit 1)))
-	  (if linktree
-	      (let ((dbdir (conc linktree "/.db")))
-		(handle-exceptions
-		 exn
-		 (begin
-		   (debug:print 0 "ERROR: failed to create the " dbdir " area for your database files")
-		   (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn)))
-		 (if (not (directory-exists? dbdir))(create-directory dbdir)))
-		(setenv "MT_LINKTREE" linktree))
-	      (begin
-		(debug:print 0 "ERROR: linktree is required in your megatest.config [setup] section")
-		(exit 1)))
-	  (if (and *toppath*
-		   (directory-exists? *toppath*))
-	      (setenv "MT_RUN_AREA_HOME" *toppath*)
+  (let ((configdat (megatest:area-configdat area-dat)))
+    (if (or force (not (hash-table? configdat)))  ;; no need to re-open on every call
+	(let* ((newconfiginfo (or (launch:read-cached-config) ;; no config cached - give up
+				  (launch:read-megatest-config (megatest:area-path area-dat))))
+	       (configdat     (car  newconfiginfo))
+	       (toppath       (cadr newconfiginfo)))
+	  (megatest:area-configinfo-set! area-dat newconfiginfo)
+	  (megatest:area-configdat-set!  area-dat configdat)
+	  (megatest:area-path-set!       area-dat toppath)
+	  (let* ((tmptransport (configf:lookup configdat "server" "transport"))
+		 (transport    (if tmptransport (string->symbol tmptransport) 'http)))
+	    (if (member transport '(http rpc nmsg))
+		(megatest:area-transport-set! area-dat transport)
+		(begin
+		  (debug:print 0 "ERROR: Unrecognised transport " transport)
+		  (exit))))
+	  (let ((linktree (configf:lookup configdat "setup" "linktree"))) ;; link tree is critical
+	    (if linktree
+		(if (not (file-exists? linktree))
+		    (begin
+		      (handle-exceptions
+		       exn
+		       (begin
+			 (debug:print 0 "ERROR: Something went wrong when trying to create linktree dir at " linktree)
+			 (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
+			 (exit 1))
+		       (create-directory linktree #t))))
+		(begin
+		  (debug:print 0 "ERROR: linktree not defined in [setup] section of megatest.config")
+		  (exit 1)))
+	    (if linktree
+		(let ((dbdir (conc linktree "/.db")))
+		  (handle-exceptions
+		   exn
+		   (begin
+		     (debug:print 0 "ERROR: failed to create the " dbdir " area for your database files")
+		     (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn)))
+		   (if (not (directory-exists? dbdir))(create-directory dbdir)))
+		  (setenv "MT_LINKTREE" linktree))
+		(begin
+		  (debug:print 0 "ERROR: linktree is required in your megatest.config [setup] section")
+		  (exit 1)))
+	    (if (and toppath
+		   (directory-exists? toppath))
+	      (setenv "MT_RUN_AREA_HOME" toppath)
 	      (begin
 		(debug:print 0 "ERROR: failed to find the top path to your Megatest area.")
-		(exit 1)))
-	  )))
-  *toppath*)
+		(exit 1))))
+	  toppath))))
 
-(define (launch:cache-config)
+(define (launch:cache-config area-dat)
   ;; if we have a linktree and -runtests and -target and the directory exists dump the config
   ;; to megatest-(current-seconds).cfg and symlink it to megatest.cfg
-  (if (and *configdat* 
-	   (args:get-arg "-runtests"))
-      (let* ((linktree (get-environment-variable "MT_LINKTREE"))
-	     (target   (common:args-get-target))
-	     (runname  (or (args:get-arg "-runname")
-			   (args:get-arg ":runname")))
-	     (fulldir  (conc linktree "/"
-			     target "/"
-			     runname)))
-	(debug:print-info 0 "Have -runtests with target=" target ", runname=" runname ", fulldir=" fulldir)
-	(if (file-exists? linktree) ;; can't proceed without linktree
-	    (begin
-	      (if (not (file-exists? fulldir))
-		  (create-directory fulldir #t)) ;; need to protect with exception handler 
-	      (if (and target
-		       runname
-		       (file-exists? fulldir))
-		  (let ((tmpfile  (conc fulldir "/.megatest.cfg." (current-seconds)))
-			(targfile (conc fulldir "/.megatest.cfg")))
-		    (debug:print-info 0 "Caching megatest.config in " fulldir "/.megatest.cfg")
-		    (configf:write-alist *configdat* tmpfile)
-		    (system (conc "ln -sf " tmpfile " " targfile))
-		    )))))))
+  (let ((configdat (megatest:area-configdat area-dat)))
+    (if (and configdat 
+	     (args:get-arg "-runtests"))
+	(let* ((linktree (get-environment-variable "MT_LINKTREE"))
+	       (target   (common:args-get-target))
+	       (runname  (or (args:get-arg "-runname")
+			     (args:get-arg ":runname")))
+	       (fulldir  (conc linktree "/"
+			       target "/"
+			       runname)))
+	  (debug:print-info 0 "Have -runtests with target=" target ", runname=" runname ", fulldir=" fulldir)
+	  (if (file-exists? linktree) ;; can't proceed without linktree
+	      (begin
+		(if (not (file-exists? fulldir))
+		    (create-directory fulldir #t)) ;; need to protect with exception handler 
+		(if (and target
+			 runname
+			 (file-exists? fulldir))
+		    (let ((tmpfile  (conc fulldir "/.megatest.cfg." (current-seconds)))
+			  (targfile (conc fulldir "/.megatest.cfg")))
+		      (debug:print-info 0 "Caching megatest.config in " fulldir "/.megatest.cfg")
+		      (configf:write-alist configdat tmpfile)
+		      (system (conc "ln -sf " tmpfile " " targfile))
+		      ))))))))
 
 (define (get-best-disk confdat)
   (let* ((disks    (hash-table-ref/default confdat "disks" #f))
 	 (minspace (let ((m (configf:lookup confdat "setup" "minspace")))
 		     (string->number (or m "10000")))))
@@ -606,12 +615,13 @@
 ;; 
 ;; All log file links should be stored relative to the top of link path
 ;;  
 ;; <target> - <testname> [ - <itempath> ] 
 ;;
-(define (create-work-area run-id run-info keyvals test-id test-src-path disk-path testname itemdat #!key (remtries 2))
-  (let* ((item-path (if (string? itemdat) itemdat (item-list->path itemdat))) ;; if pass in string - just use it
+(define (create-work-area run-id run-info keyvals test-id test-src-path disk-path testname itemdat area-dat #!key (remtries 2))
+  (let* ((configdat (megatest:area-configdat area-dat))
+	 (item-path (if (string? itemdat) itemdat (item-list->path itemdat))) ;; if pass in string - just use it
 	 (runname   (if (string? run-info) ;; if we pass in a string as run-info use it as run-name.
 			run-info
 			(db:get-value-by-header (db:get-rows run-info)
 						(db:get-header run-info)
 						"runname")))
@@ -627,12 +637,12 @@
 	 ;; nb// if itempath is not "" then it is prefixed with "/"
 	 (toptest-path (conc disk-path "/" testtop-base))
 	 (test-path    (conc disk-path "/" test-base))
 
 	 ;; ensure this exists first as links to subtests must be created there
-	 (linktree  (let ((rd (config-lookup *configdat* "setup" "linktree")))
-		      (if rd rd (conc *toppath* "/runs"))))
+	 (linktree  (let ((rd (config-lookup configdat "setup" "linktree")))
+		      (if rd rd (conc (megatest:area-path area-dat) "/runs"))))
 
 	 (lnkbase   (conc linktree "/" target "/" runname))
 	 (lnkpath   (conc lnkbase "/" testname))
 	 (lnkpathf  (conc lnkpath (if not-iterated "" "/") item-path))
 	 (lnktarget (conc lnkpath "/" item-path)))
@@ -751,11 +761,11 @@
     (if (not (directory? test-path))
 	(create-directory test-path #t)) ;; this is a hack, I don't know why out of the blue this path does not exist sometimes
 
     (if (and test-src-path (directory? test-path))
 	(begin
-	  (let* ((ovrcmd (let ((cmd (config-lookup *configdat* "setup" "testcopycmd")))
+	  (let* ((ovrcmd (let ((cmd (config-lookup configdat "setup" "testcopycmd")))
 			   (if cmd
 			       ;; substitute the TEST_SRC_PATH and TEST_TARG_PATH
 			       (string-substitute "TEST_TARG_PATH" test-path
 						  (string-substitute "TEST_SRC_PATH" test-src-path cmd #t) #t)
 			       #f)))
@@ -779,35 +789,37 @@
 ;; 3. create link from run dir to megatest runs area 
 ;; 4. remotely run the test on allocated host
 ;;    - could be ssh to host from hosts table (update regularly with load)
 ;;    - could be netbatch
 ;;      (launch-test db (cadr status) test-conf))
-(define (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat params)
-  (change-directory *toppath*)
+(define (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat params area-dat)
+  (let ((toppath   (megatest:area-path      area-dat))
+	(configdat (megatest:area-configdat area-dat)))
+  (change-directory toppath)
   (alist->env-vars ;; consolidate this code with the code in megatest.scm for "-execute"
    (list ;; (list "MT_TEST_RUN_DIR" work-area)
-    (list "MT_RUN_AREA_HOME" *toppath*)
+    (list "MT_RUN_AREA_HOME" toppath)
     (list "MT_TEST_NAME" test-name)
     ;; (list "MT_ITEM_INFO" (conc itemdat)) 
     (list "MT_RUNNAME"   runname)
     ;; (list "MT_TARGET"    mt_target)
     ))
-  (let* ((useshell        (let ((ush (config-lookup *configdat* "jobtools"     "useshell")))
+  (let* ((useshell        (let ((ush (config-lookup configdat "jobtools"     "useshell")))
 			    (if ush 
 				(if (equal? ush "no") ;; must use "no" to NOT use shell
 				    #f
 				    ush)
 				#t)))     ;; default is yes
-	 (launcher        (config-lookup *configdat* "jobtools"     "launcher"))
+	 (launcher        (config-lookup configdat "jobtools"     "launcher"))
 	 (runscript       (config-lookup test-conf   "setup"        "runscript"))
 	 (ezsteps         (> (length (hash-table-ref/default test-conf "ezsteps" '())) 0)) ;; don't send all the steps, could be big
 	 (diskspace       (config-lookup test-conf   "requirements" "diskspace"))
 	 (memory          (config-lookup test-conf   "requirements" "memory"))
-	 (hosts           (config-lookup *configdat* "jobtools"     "workhosts"))
-	 (remote-megatest (config-lookup *configdat* "setup" "executable"))
+	 (hosts           (config-lookup configdat "jobtools"     "workhosts"))
+	 (remote-megatest (config-lookup configdat "setup" "executable"))
 	 (run-time-limit  (or (configf:lookup  test-conf   "requirements" "runtimelim")
-			      (configf:lookup  *configdat* "setup" "runtimelim")))
+			      (configf:lookup  configdat "setup" "runtimelim")))
 	 ;; FIXME SOMEDAY: not good how this is so obtuse, this hack is to 
 	 ;;                allow running from dashboard. Extract the path
 	 ;;                from the called megatest and convert dashboard
 	 ;;             	  or dboard to megatest
 	 (local-megatest  (let* ((lm  (car (argv)))
@@ -842,16 +854,16 @@
     (if (and (args:get-arg "-preclean") ;; user has requested to preclean for this run
 	     (not (member (db:test-get-rundir testinfo)(list "n/a" "/tmp/badname")))) ;; n/a is a placeholder and thus not a read dir
 	(begin
 	  (debug:print-info 0 "attempting to preclean directory " (db:test-get-rundir testinfo) " for test " test-name "/" item-path)
 	  (runs:remove-test-directory testinfo 'remove-data-only))) ;; remove data only, do not perturb the record
-
+    
     ;; prevent overlapping actions - set to LAUNCHED as early as possible
     ;;
     (tests:test-set-status! run-id test-id "LAUNCHED" "n/a" #f #f) ;; (if launch-results launch-results "FAILED"))
     (rmt:roll-up-pass-fail-counts run-id test-name item-path "LAUNCHED")
-    (set! diskpath (get-best-disk *configdat*))
+    (set! diskpath (get-best-disk configdat))
     (if diskpath
 	(let ((dat  (create-work-area run-id run-info keyvals test-id test-path diskpath test-name itemdat)))
 	  (set! work-area (car dat))
 	  (set! toptest-work-area (cadr dat))
 	  (debug:print-info 2 "Using work area " work-area))
@@ -862,13 +874,13 @@
     (set! cmdparms (base64:base64-encode 
 		    (z3:encode-buffer 
 		     (with-output-to-string
 		       (lambda () ;; (list 'hosts     hosts)
 			 (write (list (list 'testpath  test-path)
-				      (list 'transport (conc *transport-type*))
+				      (list 'transport (conc (megatest:area-transport area-dat))) ;;; *transport-type*))
 				      ;; (list 'serverinf *server-info*)
-				      (list 'toppath   *toppath*)
+				      (list 'toppath   toppath)
 				      (list 'work-area work-area)
 				      (list 'test-name test-name) 
 				      (list 'runscript runscript) 
 				      (list 'run-id    run-id   )
 				      (list 'test-id   test-id  )
@@ -876,11 +888,11 @@
 				      (list 'itemdat   itemdat  )
 				      (list 'megatest  remote-megatest)
 				      (list 'ezsteps   ezsteps) 
 				      (list 'target    mt_target)
 				      (list 'runtlim   (if run-time-limit (common:hms-string->seconds run-time-limit) #f))
-				      (list 'env-ovrd  (hash-table-ref/default *configdat* "env-override" '())) 
+				      (list 'env-ovrd  (hash-table-ref/default configdat "env-override" '())) 
 				      (list 'set-vars  (if params (hash-table-ref/default params "-setvars" #f)))
 				      (list 'runname   runname)
 				      (list 'mt-bindir-path mt-bindir-path))))))))
 
     ;; clean out step records from previous run if they exist
@@ -900,11 +912,11 @@
     (if (args:get-arg "-xterm")(set! fullcmd (append fullcmd (list "-xterm"))))
     (debug:print 1 "Launching " work-area)
     ;; set pre-launch-env-vars before launching, keep the vars in prevvals and put the envionment back when done
     (debug:print 4 "fullcmd: " fullcmd)
     (let* ((commonprevvals (alist->env-vars
-			    (hash-table-ref/default *configdat* "env-override" '())))
+			    (hash-table-ref/default configdat "env-override" '())))
 	   (testprevvals   (alist->env-vars
 			    (hash-table-ref/default test-conf "pre-launch-env-overrides" '())))
 	   (miscprevvals   (alist->env-vars ;; consolidate this code with the code in megatest.scm for "-execute"
 			    (append (list (list "MT_TEST_RUN_DIR" work-area)
 					  (list "MT_TEST_NAME" test-name)
@@ -913,11 +925,11 @@
 					  (list "MT_TARGET"    mt_target)
 					  (list "MT_ITEMPATH"  item-path)
 					  )
 				    itemdat)))
 	   ;; Launchwait defaults to true, must override it to turn off wait
-	   (launchwait     (if (equal? (configf:lookup *configdat* "setup" "launchwait") "no") #f #t))
+	   (launchwait     (if (equal? (configf:lookup configdat "setup" "launchwait") "no") #f #t))
 	   (launch-results (apply (if launchwait
 				      cmd-run-with-stderr->list
 				      process-run)
 				  (if useshell
 				      (let ((cmdstr (string-intersperse fullcmd " ")))
@@ -950,7 +962,9 @@
             ))
       (alist->env-vars miscprevvals)
       (alist->env-vars testprevvals)
       (alist->env-vars commonprevvals)
       launch-results))
-  (change-directory *toppath*))
+  (change-directory toppath))
+  ;; added paren below after refactoring above routine. must have missed something?
+  )
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -50,19 +50,31 @@
 (include "megatest-fossil-hash.scm")
 
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.megatestrc")))
   (if (file-exists? debugcontrolf)
       (load debugcontrolf)))
+
+(define *area-dat* (make-megatest:area
+		    "default"         ;; area name
+		    #f                ;; area path
+		    'http             ;; transport
+		    #f                ;; configinfo
+		    #f                ;; configdat
+		    (make-hash-table) ;; denoise
+		    #f                ;; client signature
+		    #f                ;; remote connections
+		    ))
+
 
 ;; Disabled help items
 ;;  -rollup                 : (currently disabled) fill run (set by :runname)  with latest test(s)
 ;;                            from prior runs with same keys
 
 (define help (conc "
 Megatest, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
-  license GPL, Copyright Matt Welland 2006-2012
+  license GPL, Copyright Matt Welland 2006-2015
 
 Usage: megatest [options]
   -h                      : this help
   -version                : print megatest version (currently " megatest-version ")
 
@@ -301,11 +313,12 @@
 (define *time-zero* (current-seconds))
 (define *watchdog*
   (make-thread 
    (lambda ()
      (thread-sleep! 0.05) ;; delay for startup
-     (let ((legacy-sync (configf:lookup *configdat* "setup" "megatest-db"))
+     ;; the query to get megatest-db setting might not work, forcing it to be default on. Use "no" to turn off
+     (let ((legacy-sync (configf:lookup (megatest:area-configdat *area-dat*) "setup" "megatest-db"))
 	   (debug-mode  (debug:debug-mode 1))
 	   (last-time   (current-seconds)))
        (let loop ()
 	 ;; sync for filesystem local db writes
 	 ;;
@@ -312,11 +325,11 @@
 	 (let ((start-time      (current-seconds))
 	       (servers-started (make-hash-table)))
 	   (for-each 
 	    (lambda (run-id)
 	      (mutex-lock! *db-multi-sync-mutex*)
-	      (if (and legacy-sync 
+	      (if (and (not (equal? legacy-sync "no"))
 		       (hash-table-ref/default *db-local-sync* run-id #f))
 		  ;; (if (> (- start-time last-write) 5) ;; every five seconds
 		  (begin ;; let ((sync-time (- (current-seconds) start-time)))
 		    (db:multi-db-sync (list run-id) 'new2old)
 		    (if (common:low-noise-print 30 "sync new to old")
@@ -427,11 +440,11 @@
     (begin
       (save-environment-as-files (args:get-arg "-env2file"))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-list-disks")
-    (let ((toppath (launch:setup-for-run)))
+    (let ((toppath (launch:setup-for-run *area-dat*)))
       (print 
        (string-intersperse 
 	(map (lambda (x)
 	       (string-intersperse 
 		x
@@ -636,11 +649,11 @@
 
 (if (args:get-arg "-server")
 
     ;; Server? Start up here.
     ;;
-    (let ((tl        (launch:setup-for-run))
+    (let ((tl        (launch:setup-for-run *area-dat*))
 	  (run-id    (and (args:get-arg "-run-id")
 			  (string->number (args:get-arg "-run-id")))))
       (if run-id
 	  (begin
 	    (server:launch run-id)
@@ -656,11 +669,11 @@
 		     '("-list-servers"
 		       "-stop-server"
 		       "-show-cmdinfo"
 		       "-list-runs"
 		       "-ping")))
-	(if (launch:setup-for-run)
+	(if (launch:setup-for-run *area-dat*)
 	    (let ((run-id    (and (args:get-arg "-run-id")
 				  (string->number (args:get-arg "-run-id")))))
 	      ;; (set! *fdb*   (filedb:open-db (conc *toppath* "/db/paths.db")))
 	      ;; if not list or kill then start a client (if appropriate)
 	      (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test")
@@ -676,11 +689,11 @@
 ;; MAY STILL NEED THIS
 ;;		       (set! *megatest-db* (make-dbr:dbstruct path: *toppath* local: #t))))))))))
 
 (if (or (args:get-arg "-list-servers")
 	(args:get-arg "-stop-server"))
-    (let ((tl (launch:setup-for-run)))
+    (let ((tl (launch:setup-for-run *area-dat*)))
       (if tl 
 	  (let* ((tdbdat  (tasks:open-db))
 		 (servers (tasks:get-all-servers (db:delay-if-busy tdbdat)))
 		 (fmtstr  "~5a~12a~8a~20a~24a~10a~10a~10a~10a\n")
 		 (servers-to-kill '())
@@ -753,11 +766,11 @@
 		     (read-config (conc *toppath* "/runconfigs.config") #f #t sections: sections))))
     data))
 
 
 (if (args:get-arg "-show-runconfig")
-    (let ((tl (launch:setup-for-run)))
+    (let ((tl (launch:setup-for-run *area-dat*)))
       (push-directory *toppath*)
       (let ((data (full-runconfigs-read)))
 	;; keep this one local
 	(cond
 	 ((and (args:get-arg "-section")
@@ -772,11 +785,11 @@
 	  (debug:print 0 "ERROR: -dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
 	(set! *didsomething* #t))
       (pop-directory)))
 
 (if (args:get-arg "-show-config")
-    (let ((tl   (launch:setup-for-run))
+    (let ((tl   (launch:setup-for-run *area-dat*))
 	  (data *configdat*)) ;; (read-config "megatest.config" #f #t)))
       (push-directory *toppath*)
       ;; keep this one local
       (cond 
        ((and (args:get-arg "-section")
@@ -878,11 +891,11 @@
 
 ;; NOTE: list-runs and list-db-targets operate on local db!!!
 ;;
 (if (or (args:get-arg "-list-runs")
 	(args:get-arg "-list-db-targets"))
-    (if (launch:setup-for-run)
+    (if (launch:setup-for-run *area-dat*)
 	(let* ((dbstruct (make-dbr:dbstruct path: *toppath* local: #t))
 	       (runpatt  (args:get-arg "-list-runs"))
 	       (testpatt (if (args:get-arg "-testpatt") 
 			     (args:get-arg "-testpatt") 
 			     "%"))
@@ -1102,11 +1115,11 @@
 	  (change-directory toppath)
 	  (if (not target)
 	      (begin
 		(debug:print 0 "ERROR: -target is required.")
 		(exit 1)))
-	  (if (not (launch:setup-for-run))
+	  (if (not (launch:setup-for-run *area-dat*))
 	      (begin
 		(debug:print 0 "Failed to setup, giving up on -test-paths or -test-files, exiting")
 		(exit 1)))
 	  (let* ((keys     (rmt:get-keys))
 		 ;; db:test-get-paths must not be run remote
@@ -1190,11 +1203,11 @@
 	     (test-id   (assoc/default 'test-id   cmdinfo))
 	     (itemdat   (assoc/default 'itemdat   cmdinfo))
 	     (work-area (assoc/default 'work-area cmdinfo))
 	     (db        #f))
 	(change-directory testpath)
-	(if (not (launch:setup-for-run))
+	(if (not (launch:setup-for-run *area-dat*))
 	    (begin
 	      (debug:print 0 "Failed to setup, exiting")
 	      (exit 1)))
 	(if (and state status)
 	    (rmt:teststep-set-status! run-id test-id step state status msg logfile)
@@ -1238,11 +1251,11 @@
 	       (itemdat   (assoc/default 'itemdat   cmdinfo))
 	       (work-area (assoc/default 'work-area cmdinfo))
 	       (db        #f) ;; (open-db))
 	       (state     (args:get-arg ":state"))
 	       (status    (args:get-arg ":status")))
-	  (if (not (launch:setup-for-run))
+	  (if (not (launch:setup-for-run *area-dat*))
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 
 	  (if (args:get-arg "-runstep")(debug:print-info 1 "Running -runstep, first change to directory " work-area))
@@ -1343,11 +1356,11 @@
 
 (if (or (args:get-arg "-showkeys")
         (args:get-arg "-show-keys"))
     (let ((db #f)
 	  (keys #f))
-      (if (not (launch:setup-for-run))
+      (if (not (launch:setup-for-run *area-dat*))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting")
 	    (exit 1)))
       (set! keys (cdb:remote-run db:get-keys db))
       (debug:print 1 "Keys: " (string-intersperse keys ", "))
@@ -1374,21 +1387,21 @@
 ;; Update the database schema, clean up the db
 ;;======================================================================
 
 (if (args:get-arg "-rebuild-db")
     (begin
-      (if (not (launch:setup-for-run))
+      (if (not (launch:setup-for-run *area-dat*))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
       (open-run-close patch-db #f)
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-cleanup-db")
     (begin
-      (if (not (launch:setup-for-run))
+      (if (not (launch:setup-for-run *area-dat*))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
       ;; (open-run-close db:clean-up #f)
@@ -1403,11 +1416,11 @@
        )
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-mark-incompletes")
     (begin
-      (if (not (launch:setup-for-run))
+      (if (not (launch:setup-for-run *area-dat*))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") b
 	    (exit 1)))
       (open-run-close db:find-and-mark-incomplete #f)
       (set! *didsomething* #t)))
@@ -1416,11 +1429,11 @@
 ;; Update the tests meta data from the testconfig files
 ;;======================================================================
 
 (if (args:get-arg "-update-meta")
     (begin
-      (if (not (launch:setup-for-run))
+      (if (not (launch:setup-for-run *area-dat*))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       ;; now can find our db
       ;; keep this one local
@@ -1434,11 +1447,11 @@
 ;; fakeout readline
 (define (toplevel-command . a) #f)
 
 (if (or (args:get-arg "-repl")
 	(args:get-arg "-load"))
-    (let* ((toppath (launch:setup-for-run))
+    (let* ((toppath (launch:setup-for-run *area-dat*))
 	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t) #f)))
       (if dbstruct
 	  (begin
 	    (set! *db* dbstruct)
 	    (set! *client-non-blocking-mode* #t)
@@ -1463,11 +1476,11 @@
 ;;======================================================================
 
 (if (and (args:get-arg "-run-wait")
 	 (not (args:get-arg "-runtests"))) ;; run-wait is built into runtests now
     (begin
-      (if (not (launch:setup-for-run))
+      (if (not (launch:setup-for-run *area-dat*))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       (operate-on 'run-wait)
       (set! *didsomething* #t)))

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -80,12 +80,11 @@
 	;;  ;; (and (not (rmt:write-frequency-over-limit? cmd run-id))
 	(if (tasks:server-running-or-starting? (db:delay-if-busy (tasks:open-db)) run-id)
 	    (client:setup run-id remote: remote)
 	    #f))))
 
-(define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id
-(define (rmt:send-receive cmd rid params #!key (attemptnum 1)(remote #f)) ;; start attemptnum at 1 so the modulo below works as expected
+(define (rmt:discard-old-connections)
   ;; clean out old connections
   (mutex-lock! *db-multi-sync-mutex*)
   (let ((expire-time (- (current-seconds) (server:get-timeout) 10))) ;; don't forget the 10 second margin
     (for-each 
      (lambda (run-id)
@@ -98,11 +97,16 @@
 	       (case *transport-type*
 		 ((nmsg)(nn-close (http-transport:server-dat-get-socket 
 				   (common:get-remote remote run-id)))))
                (common:del-remote! remote run-id)))))
      (common:get-remote-all remote)))
-  (mutex-unlock! *db-multi-sync-mutex*)
+  (mutex-unlock! *db-multi-sync-mutex*))
+
+(define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id
+
+(define (rmt:send-receive cmd rid params #!key (attemptnum 1)(remote #f)) ;; start attemptnum at 1 so the modulo below works as expected
+  (rmt:discard-old-connections)
   ;; (mutex-lock! *send-receive-mutex*)
   (let* ((run-id          (if rid rid 0))
 	 (connection-info (rmt:get-connection-info run-id)))
     ;; the nmsg method does the encoding under the hood (the http method should be changed to do this also)
     (if connection-info