pass ENV["PS"] through to child processes (worker.1) and use it for display output

This commit is contained in:
David Dollar
2010-10-15 16:08:33 -07:00
parent 0ae144e468
commit 615bb0d4ba
+6 -5
View File
@@ -66,18 +66,19 @@ private ######################################################################
concurrency = Foreman::Utils.parse_concurrency(options[:concurrency]) concurrency = Foreman::Utils.parse_concurrency(options[:concurrency])
1.upto(concurrency[process.name]) do |num| 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
end end
def fork_individual(process, port) def fork_individual(process, num, port)
ENV["PORT"] = port.to_s ENV["PORT"] = port.to_s
ENV["PS"] = "#{process.name}.#{num}"
pid = Process.fork do pid = Process.fork do
run(process) run(process)
end end
info "started with pid #{pid}", process info "started with pid #{pid}, PORT=#{port}", process
running_processes[pid] = process running_processes[pid] = process
end end
@@ -128,8 +129,8 @@ private ######################################################################
end end
def pad_process_name(process) def pad_process_name(process)
name = process ? "#{process.name}:#{ENV["PORT"]}" : "system" name = process ? "#{ENV["PS"]}" : "system"
name.ljust(longest_process_name + 6) # add 6 for port padding name.ljust(longest_process_name + 3) # add 3 for process number padding
end end
def print_info def print_info