@@ -323,16 +323,26 @@
 ;; wait for server=start-last to be three seconds old
 ;;
 (define (server:wait-for-server-start-last-flag areapath)
   (let* ((start-flag (conc areapath "/logs/server-start-last"))
 	 ;;; THIS INTERACTS WITH [server] timeout. Suggest using 0.1 or above for timeout (6 seconds)
-	 (reftime    (configf:lookup-number *configdat* "server" "idletime" default: 4)))
+	 (reftime    (configf:lookup-number *configdat* "server" "idletime" default: 4))
+	 (server-key (conc (get-host-name) "-" (current-process-id))))
     (if (file-exists? start-flag)
 	(let* ((fmodtime (file-modification-time start-flag))
 	       (delta    (- (current-seconds) fmodtime))
 	       (all-go   (> delta reftime)))
-	  (if all-go
+	  (if (and all-go
+		   (begin
+		     (with-output-to-file start-flag
+		       (lambda ()
+			 (print server-key)))
+		     (thread-sleep! 0.25)
+		     (let ((res (with-input-from-file start-flag
+				  (lambda ()
+				    (read-line)))))
+		       (equal? server-key res))))
 	      #t ;; (system (conc "touch " start-flag)) ;; lazy but safe
 	      (begin
 		(debug:print-info 0 *default-log-port* "Gating server start, last start: "
 				  fmodtime ", delta: " delta ", reftime: " reftime ", all-go=" all-go)
 		(thread-sleep! reftime)