@@ -603,12 +603,13 @@
     (handle-exceptions
 	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
+	     (dbname (args:get-arg "-db"))   ;; for the server logfile name
 	     (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")))
+		       (conc tl "/logs/server-"(or dbname "unk")"-"(current-process-id) "-" (get-host-name) ".log")))
 	     (oup  (open-logfile logf)))
 	(if (not (args:get-arg "-log"))
 	    (hash-table-set! args:arg-hash "-log" logf)) ;; fake out future queries of -log
 	(debug:print-info 0 *default-log-port* "Sending log output to " logf)
 	(set! *default-log-port* oup))))
@@ -935,22 +936,22 @@
 ;;======================================================================
 
 ;; Server? Start up here.
 ;;
 (if (args:get-arg "-server")
-    (let* ((run-id     (args:get-arg "-run-id"))
+    (let* (;; (run-id     (args:get-arg "-run-id"))
 	   (dbfname    (args:get-arg "-db"))
 	   (tl         (launch:setup))
 	   (keys       (keys:config-get-fields *configdat*)))
       (case (rmt:transport-mode)
 	((http)(http-transport:launch))
 	((tcp)
 	 (debug:print 0 *default-log-port* "INFO: Running using tcp method.")
-	 (if run-id
-	     (tt:start-server tl run-id dbfname api:tcp-dispatch-request-make-handler keys)
+	 (if dbfname
+	     (tt:start-server tl #f dbfname api:tcp-dispatch-request-make-handler keys)
 	     (begin
-	       (debug:print 0 *default-log-port* "ERROR: transport mode is tcp - -run-id is required.")
+	       (debug:print 0 *default-log-port* "ERROR: transport mode is tcp - -db 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