@@ -587,13 +587,12 @@
 ;; where (launch:setup) returns #f?
 ;;
 (if (or (args:get-arg "-log")(args:get-arg "-server")) ;; redirect the log always when a server
     (handle-exceptions
 	exn
-	(begin
-	  (print "ERROR: Failed to switch to log output. " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
-	  )
+      (begin
+	(print "ERROR: Failed to switch to log output. " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
       (let* ((tl   (or (args:get-arg "-log")(launch:setup)))   ;; run launch:setup if -server, ensure we do NOT run launch:setup if -log specified
 	     (logf (or (args:get-arg "-log") ;; use -log unless we are a server, then craft a logfile name
 		       (conc tl "/logs/server-" (current-process-id) "-" (get-host-name) ".log")))
 	     (oup  (open-logfile logf)))
 	(if (not (args:get-arg "-log"))
@@ -923,15 +922,21 @@
 ;;======================================================================
 
 ;; Server? Start up here.
 ;;
 (if (args:get-arg "-server")
-    (let ((tl        (launch:setup)))
+    (let* ((run-id (args:get-arg-number "-run-id"))
+	   (tl        (launch:setup)))
       (case (rmt:transport-mode)
 	((http)(http-transport:launch))
-	((tcp) (tt:start-server tl))
-	(else (debug:print 0 "ERROR: rmt:transport-mode value not recognised "(rmt:transport-mode))))
+	((tcp)
+	 (if run-id
+	     (tt:start-server tl (dbmod:run-id->dbfname run-id))
+	     (begin
+	       (debug:print 0 *default-log-port* "ERROR: transport mode is tcp - -run-id is required.")
+	       (exit 1))))
+	(else (debug:print 0 *default-log-port* "ERROR: rmt:transport-mode value not recognised "(rmt:transport-mode))))
       (set! *didsomething* #t)))
 
 ;; The adjutant is a bit different, it does NOT run (launch:setup) as it is not necessarily tied to
 ;; a specific Megatest area. Detail are being hashed out and this may change.
 ;;