@@ -437,10 +437,11 @@
                             - to automatically figure out hostname
   -adjutant C,M           : start the server/adjutant with allocated cores C and Mem M (Gig), 
                             use 0,0 to auto use full machine
   -transport http|rpc     : use http or rpc for transport (default is http) 
   -log logfile            : send stdout and stderr to logfile
+  -autolog logfilebase    : appends pid and host to logfilebase for logfile
   -list-servers           : list the servers 
   -kill-servers           : kill all servers
   -repl                   : start a repl (useful for extending megatest)
   -load file.scm          : load and run file.scm
   -mark-incompletes       : find and mark incomplete tests
@@ -630,10 +631,11 @@
      			"-run-id"
      			"-ping"
      			"-refdb2dat"
      			"-o"
      			"-log"
+			"-autolog"
 			"-sync-log"
      			"-since"
      			"-fields"
      			"-recover-test" ;; run-id,test-id - used internally to recover a test stuck in RUNNING state
      			"-sort"
@@ -784,20 +786,24 @@
 
      ;; this segment will run launch:setup only if -log is not set. This is fairly safe as servers are not
      ;; manually started and thus should never be started in a non-megatest area. Thus no need to handle situation
      ;; where (launch:setup) returns #f?
      ;;
-     (if (or (args:get-arg "-log")#;(args:get-arg "-server")) ;; redirect the log always when a server
+     (if (or (args:get-arg "-log") ;;(args:get-arg "-server") ;; redirect the log always when a server
+	     (args:get-arg "-autolog"))
          (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
-     	     (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)))
+        (let* ((tl   (or (args:get-arg "-log")
+			 (args:get-arg "-autolog") ;; autolog provides the basename .../logs/something- for the logfile
+			 (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 (current-process-id)"-"(get-host-name)".log")
+     			 (conc tl "/logs/server-" (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))))