From 615bb0d4ba07bc628dee485113dd547b1f6351bb Mon Sep 17 00:00:00 2001
From: David Dollar <ddollar@gmail.com>
Date: Fri, 15 Oct 2010 16:08:33 -0700
Subject: [PATCH] pass ENV["PS"] through to child processes (worker.1) and use
 it for display output

---
 lib/foreman/engine.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/foreman/engine.rb b/lib/foreman/engine.rb
index 2966eed..b51a2f3 100644
--- a/lib/foreman/engine.rb
+++ b/lib/foreman/engine.rb
@@ -66,18 +66,19 @@ private ######################################################################
     concurrency = Foreman::Utils.parse_concurrency(options[:concurrency])
 
     1.upto(concurrency[process.name]) do |num|
-      fork_individual(process, port_for(process, num, options[:port]))
+      fork_individual(process, num, port_for(process, num, options[:port]))
     end
   end
 
-  def fork_individual(process, port)
+  def fork_individual(process, num, port)
     ENV["PORT"] = port.to_s
+    ENV["PS"]   = "#{process.name}.#{num}"
 
     pid = Process.fork do
       run(process)
     end
 
-    info "started with pid #{pid}", process
+    info "started with pid #{pid}, PORT=#{port}", process
     running_processes[pid] = process
   end
 
@@ -128,8 +129,8 @@ private ######################################################################
   end
 
   def pad_process_name(process)
-    name = process ? "#{process.name}:#{ENV["PORT"]}" : "system"
-    name.ljust(longest_process_name + 6) # add 6 for port padding
+    name = process ? "#{ENV["PS"]}" : "system"
+    name.ljust(longest_process_name + 3) # add 3 for process number padding
   end
 
   def print_info