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

Even more JRuby build fixes

This commit is contained in:
Nate Berkopec 2020-03-14 13:29:05 -06:00
parent a90c73948a
commit 910b4589be
No known key found for this signature in database
GPG key ID: BDD7A4B8E43906A6
4 changed files with 9 additions and 5 deletions

View file

@ -453,10 +453,12 @@ module Puma
end
begin
Signal.trap "SIGINFO" do
thread_status do |name, backtrace|
@events.log name
@events.log backtrace.map { |bt| " #{bt}" }
unless Puma.jruby? # INFO in use by JVM already
Signal.trap "SIGINFO" do
thread_status do |name, backtrace|
@events.log name
@events.log backtrace.map { |bt| " #{bt}" }
end
end
end
rescue Exception

View file

@ -19,7 +19,7 @@ class TestIntegration < Minitest::Test
end
def teardown
if defined?(@server) && @server
if defined?(@server) && @server && @pid
stop_server @pid, signal: :INT
end

View file

@ -279,6 +279,7 @@ class TestBinder < TestBinderBase
end
def test_socket_activation_unix
skip_on :jruby # Failing with what I think is a JRuby bug
skip UNIX_SKT_MSG unless UNIX_SKT_EXIST
path = "test/unixserver.state"
sock = Addrinfo.unix(path).listen

View file

@ -47,6 +47,7 @@ class TestRedirectIO < TestIntegration
end
def test_sighup_redirects_io_cluster
skip_on :jruby # Server isn't coming up in CI, TODO Fix
skip_unless_signal_exist? :HUP
cli_args = [