Run exec properly to restart. Fixes #154

puma · Mar 19, 2013 · 7c6d72b · 7c6d72b
1 parent 86b9bf5
commit 7c6d72b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/puma/cli.rb b/lib/puma/cli.rb
@@ -115,7 +115,7 @@ def restart!
         end
 
         require 'puma/jruby_restart'
-        JRubyRestart.chdir_exec(@restart_dir, Gem.ruby, *@restart_argv)
+        JRubyRestart.chdir_exec(@restart_dir, @restart_argv)
       else
         redirects = {}
         @binder.listeners.each_with_index do |(l,io),i|

diff --git a/lib/puma/jruby_restart.rb b/lib/puma/jruby_restart.rb
@@ -8,12 +8,12 @@ module JRubyRestart
     attach_function :execlp, [:string, :varargs], :int
     attach_function :chdir, [:string], :int
 
-    def self.chdir_exec(dir, cmd, *argv)
+    def self.chdir_exec(dir, argv)
       chdir(dir)
-      argv.unshift(cmd)
+      cmd = argv.first
       argv = ([:string] * argv.size).zip(argv).flatten
-      argv <<:int
-      argv << 0
+      argv << :string
+      argv << nil
       execlp(cmd, *argv)
       raise SystemCallError.new(FFI.errno)
     end