kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

Fix jruby daemonization. Fixes #918

Browse source
This commit is contained in:
Evan Phoenix 2016-03-05 16:28:39 -08:00
parent 495e0d776f
commit d7c13dd63f
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/puma/launcher.rb
View file

@ -191,6 +191,15 @@ module Puma
@binder.connected_port
end
def restart_args
cmd = @options[:restart_cmd]
if cmd
cmd.split(' ') + @original_argv
else
@restart_argv
end
end
private
def reload_worker_directory
@ -260,15 +269,6 @@ module Puma
(@options[:workers] || 0) > 0
end
def restart_args
cmd = @options[:restart_cmd]
if cmd
cmd.split(' ') + @original_argv
else
@restart_argv
end
end
def unsupported(str)
@events.error(str)
raise UnsupportedOption

2
lib/puma/single.rb
View file

@ -32,7 +32,7 @@ module Puma
def jruby_daemon_start
require 'puma/jruby_restart'
JRubyRestart.daemon_start(@restart_dir, restart_args)
JRubyRestart.daemon_start(@restart_dir, @launcher.restart_args)
end
def run