0.31.0

Different port range for each process type on 'foreman start'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    foreman (0.30.0)
+    foreman (0.31.0)
       term-ansicolor (~> 1.0.5)
       thor (>= 0.13.6)
 

lib/foreman/engine.rb

@@ -7,6 +7,7 @@ require "tempfile"
 require "timeout"
 require "term/ansicolor"
 require "fileutils"
+require "thread"
 
 class Foreman::Engine
 
@@ -57,7 +58,7 @@ private ######################################################################
 
     procfile.entries.each do |entry|
       reader, writer = IO.pipe
-      entry.spawn(concurrency[entry.name], writer, @directory, @environment, base_port).each do |process|
+      entry.spawn(concurrency[entry.name], writer, @directory, @environment, port_for(entry, 1, base_port)).each do |process|
         running_processes[process.pid] = process
         readers[process] = reader
       end
@@ -70,6 +71,7 @@ private ######################################################################
 
   def kill_all(signal="SIGTERM")
     running_processes.each do |pid, process|
+      info "sending #{signal} to pid #{pid}"
       Process.kill(signal, pid) rescue Errno::ESRCH
     end
   end

lib/foreman/process.rb

@@ -28,21 +28,18 @@ class Foreman::Process
 private
 
   def fork_with_io(command)
-    io = case RUBY_VERSION
+    reader, writer = IO.pipe
-    when /^1\.9\./
+    pid = fork do
-      IO.popen([Foreman.runner, replace_command_env(command)], "w+")
+      trap("INT", "IGNORE")
-    when /^1\.8\./
+      $stdout.reopen writer
-      full_command = replace_command_env(command).gsub("'", "\\'")
+      reader.close
-      IO.popen("#{Foreman.runner} '#{full_command}'", "w+")
+      exec Foreman.runner, replace_command_env(command)
-    else
-      raise "Unknown Ruby version: #{RUBY_VERSION}"
     end
-    [ io, io.pid ]
+    [ reader, pid ]
   end
 
   def run_process(command, pipe)
     io, @pid = fork_with_io(command)
-    trap("SIGTERM") { "got sigterm for %d" % @pid }
     output pipe, "started with pid %d" % @pid
     Thread.new do
       until io.eof?

lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.30.0"
+  VERSION = "0.31.0"
 
 end