0.7.4

export/upstart/process.conf.erb

@@ -3,4 +3,4 @@ stop on stopping <%= app %>-<%= process.name %>
 respawn
 
 chdir <%= engine.directory %>
-exec su - <%= user %> -c 'export PORT=<%= port %>; <%= process.command %> >> <%= log_root %>/<%=process.name%>-<%=num%>.log 2>&1'
+exec su <%= user %> -c "PORT=<%= port %> <%= process.command %> >> <%= log_root %>/<%=process.name%>-<%=num%>.log 2>&1"

lib/foreman.rb

@@ -1,6 +1,6 @@
 module Foreman
 
-  VERSION = "0.8.0"
+  VERSION = "0.7.4"
 
   class AppDoesNotExist < Exception; end
 

lib/foreman/engine.rb

@@ -39,8 +39,8 @@ class Foreman::Engine
       fork process, options
     end
 
-    trap("TERM") { puts "SIGTERM received"; kill_all("TERM") }
+    trap("TERM") { kill_and_exit("TERM") }
-    trap("INT")  { puts "SIGINT received";  kill_all("INT")  }
+    trap("INT")  { kill_and_exit("INT")  }
 
     watch_for_termination
   end
@@ -48,8 +48,8 @@ class Foreman::Engine
   def execute(name, options={})
     fork processes[name], options
 
-    trap("TERM") { puts "SIGTERM received"; kill_all("TERM") }
+    trap("TERM") { kill_and_exit("TERM") }
-    trap("INT")  { puts "SIGINT received";  kill_all("INT")  }
+    trap("INT")  { kill_and_exit("INT")  }
 
     watch_for_termination
   end
@@ -100,12 +100,13 @@ private ######################################################################
     end
   end
 
-  def kill_all(signal="TERM")
+  def kill_and_exit(signal="TERM")
     info "terminating"
     running_processes.each do |pid, process|
       info "killing #{process.name} in pid #{pid}"
       Process.kill(signal, pid)
     end
+    exit 0
   end
 
   def info(message, process=nil)
@@ -148,8 +149,7 @@ private ######################################################################
     pid, status = Process.wait2
     process = running_processes.delete(pid)
     info "process terminated", process
-    kill_all
+    kill_and_exit
-    Process.waitall
   end
 
   def running_processes