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

make restart via pumactl more robust (#1324)

Browse source
This commit is contained in:
Michael Grosser 2017-06-04 05:48:04 -07:00 • committed by Nate Berkopec
parent 290c22c9ad
commit 65a51b513a
2 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/helper.rb
View file

@ -13,6 +13,7 @@ require "minitest/autorun"
require "minitest/pride"
$LOAD_PATH << File.expand_path("../../lib", __FILE__)
Thread.abort_on_exception = true
require "puma"
require "puma/detect"

34
test/test_integration.rb
View file

@ -133,23 +133,17 @@ class TestIntegration < Minitest::Test
skip "Too finicky, fails 50% of the time on CI" if ENV["CI"]
skip if Puma.jruby? || Puma.windows?
conf = Puma::Configuration.new do |c|
c.quiet
c.state_path @state_path
c.bind "unix://#{@bind_path}"
c.activate_control_app "unix://#{@control_path}", :auth_token => @token
c.workers 2
c.worker_shutdown_timeout 1
c.rackup "test/rackup/hello-stuck.ru"
end
l = Puma::Launcher.new conf, :events => @events
Thread.abort_on_exception = true
t = Thread.new do
Thread.current.abort_on_exception = true
l.run
launcher_thread = Thread.new do
conf = Puma::Configuration.new do |c|
c.quiet
c.state_path @state_path
c.bind "unix://#{@bind_path}"
c.activate_control_app "unix://#{@control_path}", :auth_token => @token
c.workers 2
c.worker_shutdown_timeout 1
c.rackup "test/rackup/hello-stuck.ru"
end
Puma::Launcher.new(conf, :events => @events).run
end
wait_booted
@ -161,7 +155,7 @@ class TestIntegration < Minitest::Test
sout = StringIO.new
# Phased restart
ccli = Puma::ControlCLI.new %W!-S #{@state_path} phased-restart!, sout
ccli = Puma::ControlCLI.new ["-S", @state_path, "phased-restart"], sout
ccli.run
sleep 20
@events.stdout.rewind
@ -170,10 +164,10 @@ class TestIntegration < Minitest::Test
assert_match(/- Worker \d \(pid: \d+\) booted, phase: 1/, log)
# Stop
ccli = Puma::ControlCLI.new %W!-S #{@state_path} stop!, sout
ccli = Puma::ControlCLI.new ["-S", @state_path, "stop"], sout
ccli.run
assert_kind_of Thread, t.join(5), "server didn't stop"
assert_kind_of Thread, launcher_thread.join(5), "server didn't stop"
end
def test_kill_unknown_via_pumactl