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

PluginRegistry#fire_background - fix up per issue 1972 (#1973)

* PluginRegistry#fire_background - Close #1972

* add test/test_plugin.rb, test/config/plugin1.rb
This commit is contained in:
MSP-Greg 2019-09-18 08:53:29 -05:00 committed by Nate Berkopec
parent db74ad4ab2
commit 544bb7ae81
3 changed files with 42 additions and 2 deletions

View file

@ -62,9 +62,9 @@ module Puma
end
def fire_background
@background.each do |b|
@background.each_with_index do |b, i|
Thread.new do
set_thread_name "plugin background"
Puma.set_thread_name "plugin background #{i}"
b.call
end
end

1
test/config/plugin1.rb Normal file
View file

@ -0,0 +1 @@
plugin 'tmp_restart'

39
test/test_plugin.rb Normal file
View file

@ -0,0 +1,39 @@
require_relative "helper"
require_relative "helpers/integration"
class TestPlugin < TestIntegration
def test_plugin
skip "Skipped on Windows Ruby < 2.5.0, Ruby bug" if windows? && RUBY_VERSION < '2.5.0'
@tcp_bind = UniquePort.call
@tcp_ctrl = UniquePort.call
Dir.mkdir("tmp") unless Dir.exist?("tmp")
cli_server "-b tcp://#{HOST}:#{@tcp_bind} --control-url tcp://#{HOST}:#{@tcp_ctrl} --control-token #{TOKEN} -C test/config/plugin1.rb test/rackup/hello.ru"
File.open('tmp/restart.txt', mode: 'wb') { |f| f.puts "Restart #{Time.now}" }
true while (l = @server.gets) !~ /Restarting\.\.\./
assert_match(/Restarting\.\.\./, l)
true while (l = @server.gets) !~ /Ctrl-C/
assert_match(/Ctrl-C/, l)
out = StringIO.new
cli_pumactl "-C tcp://#{HOST}:#{@tcp_ctrl} -T #{TOKEN} stop"
true while (l = @server.gets) !~ /Goodbye/
@server.close
@server = nil
out.close
end
private
def cli_pumactl(argv)
pumactl = IO.popen("#{BASE} bin/pumactl #{argv}", "r")
@ios_to_close << pumactl
Process.wait pumactl.pid
pumactl
end
end