Skip to content

Commit

Permalink
PluginRegistry#fire_background - fix up per issue 1972 (#1973)
Browse files Browse the repository at this point in the history
* PluginRegistry#fire_background - Close #1972

* add test/test_plugin.rb, test/config/plugin1.rb
  • Loading branch information
MSP-Greg authored and nateberkopec committed Sep 18, 2019
1 parent db74ad4 commit 544bb7a
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/puma/plugin.rb
Expand Up @@ -62,9 +62,9 @@ def add_background(blk)
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
Expand Down
1 change: 1 addition & 0 deletions test/config/plugin1.rb
@@ -0,0 +1 @@
plugin 'tmp_restart'
39 changes: 39 additions & 0 deletions test/test_plugin.rb
@@ -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

0 comments on commit 544bb7a

Please sign in to comment.