lib/foreman/engine.rb in foreman-0.21.0 vs lib/foreman/engine.rb in foreman-0.22.0

- old
+ new

@@ -28,11 +28,11 @@ def processes @processes ||= begin @order = [] procfile.split("\n").inject({}) do |hash, line| next hash if line.strip == "" - name, command = line.split(/ *: +/, 2) + name, command = line.split(/\s*:\s+/, 2) unless command warn_deprecated_procfile! name, command = line.split(/ +/, 2) end process = Foreman::Process.new(name, command) @@ -111,10 +111,10 @@ proctitle "ruby: foreman #{process.name}" trap("SIGINT", "IGNORE") begin Dir.chdir directory do - PTY.spawn(runner, process.command) do |stdin, stdout, pid| + PTY.spawn(process.command) do |stdin, stdout, pid| trap("SIGTERM") { Process.kill("SIGTERM", pid) } until stdin.eof? info stdin.gets, process end end