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 listeners, unix_paths public

Browse source 
This is a temporary measure to help the refactor
This commit is contained in:
Nate Berkopec 2020-03-07 07:34:35 -06:00
parent f31ce753b5
commit 27ed7b1dc1
No known key found for this signature in database
GPG key ID: BDD7A4B8E43906A6
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/puma/binder.rb
View file

@ -43,7 +43,7 @@ module Puma
@ios = []
end
attr_reader :ios
attr_reader :ios, :listeners, :unix_paths
def env(sock)
@envs.fetch(sock, @proto_env)

24
test/test_binder.rb
View file

@ -26,13 +26,13 @@ class TestBinder < TestBinderBase
def test_localhost_addresses_dont_alter_listeners_for_tcp_addresses
@binder.parse ["tcp://localhost:10001"], @events
assert_equal [], @binder.instance_variable_get(:@listeners)
assert_empty @binder.listeners
end
def test_localhost_addresses_dont_alter_listeners_for_ssl_addresses
@binder.parse ["ssl://localhost:10002?#{ssl_query}"], @events
assert_equal [], @binder.instance_variable_get(:@listeners)
assert_empty @binder.listeners
end
def test_correct_zero_port
@ -50,15 +50,9 @@ class TestBinder < TestBinderBase
@binder.parse ["ssl://localhost:0?#{ssl_query}"], @events
stdout = @events.stdout.string
assert_match ssl_regex, stdout
port = ssl_regex.match(stdout)[1].to_i
port = ssl_regex.match(@events.stdout.string)[1].to_i
refute_equal 0, port
if @binder.loopback_addresses.include? '::1'
assert_match %r!ssl://\[::1\]:(\d+)!, stdout
end
end
def test_logs_all_localhost_bindings
@ -70,6 +64,16 @@ class TestBinder < TestBinderBase
end
end
def test_logs_all_localhost_bindings_ssl
skip("Incorrectly logs localhost, not 127.0.0.1")
@binder.parse ["ssl://localhost:0?#{ssl_query}"], @events
assert_match %r!ssl://127.0.0.1:(\d+)!, @events.stdout.string
if @binder.loopback_addresses.include?("::1")
assert_match %r!ssl://\[::1\]:(\d+)!, @events.stdout.string
end
end
def test_allows_both_ssl_and_tcp
assert_parsing_logs_uri [:ssl, :tcp]
end
@ -91,7 +95,7 @@ class TestBinder < TestBinderBase
assert_match %r!unix://#{unix_path}!, @events.stdout.string
refute_includes @binder.instance_variable_get(:@unix_paths), unix_path
refute_includes @binder.unix_paths, unix_path
@binder.close_listeners