diff options
author | Miklós Fazekas <mfazekas@szemafor.com> | 2016-03-12 12:04:52 +0100 |
---|---|---|
committer | Miklós Fazekas <mfazekas@szemafor.com> | 2016-03-12 12:04:52 +0100 |
commit | 3852c73cbb33c28950c3250f1c4e7a9f24856df3 (patch) | |
tree | 8f19758283b3eabcd4f28dbed61d18a8bf50eff8 | |
parent | 9682f42c3020254edefdbc66acf421858163f005 (diff) | |
parent | 1da352d06dac8ac3fa2fe0ceb4856c2203555134 (diff) | |
download | net-ssh-multi-3852c73cbb33c28950c3250f1c4e7a9f24856df3.tar.gz |
Merge pull request #8 from eugeneius/keepalive_timeout
Use keepalive_interval option as IO select timeout
-rw-r--r-- | lib/net/ssh/multi/session.rb | 11 | ||||
-rw-r--r-- | test/session_test.rb | 21 |
2 files changed, 31 insertions, 1 deletions
diff --git a/lib/net/ssh/multi/session.rb b/lib/net/ssh/multi/session.rb index 2e2468f..409aeae 100644 --- a/lib/net/ssh/multi/session.rb +++ b/lib/net/ssh/multi/session.rb @@ -425,7 +425,7 @@ module Net; module SSH; module Multi # +false+ (the block returned +false+). def process(wait=nil, &block) realize_pending_connections! - wait = @connect_threads.any? ? 0 : wait + wait = @connect_threads.any? ? 0 : io_select_wait(wait) return false unless preprocess(&block) @@ -441,6 +441,15 @@ module Net; module SSH; module Multi end end + def io_select_wait(wait) + [wait, keepalive_interval].compact.min + end + + def keepalive_interval + servers = server_list.select { |s| s.options[:keepalive] } + servers.map { |s| s.options[:keepalive_interval] }.compact.min + end + # Runs the preprocess stage on all servers. Returns false if the block # returns false, and true if there either is no block, or it returns true. # This is called as part of the #process method. diff --git a/test/session_test.rb b/test/session_test.rb index 42a56b2..c027db9 100644 --- a/test/session_test.rb +++ b/test/session_test.rb @@ -198,4 +198,25 @@ class SessionTest < Minitest::Test IO.expects(:select).with([:a, :b, :c], [:a, :c], nil, 5).returns([[:b, :c], [:a, :c]]) @session.process(5) end + + def test_process_should_pass_minimum_keepalive_interval_as_io_select_timeout + @session.use('h1', :keepalive => true) + @session.use('h2', :keepalive_interval => 1) + @session.use('h3', :keepalive => true, :keepalive_interval => 2) + @session.use('h4', :keepalive => true, :keepalive_interval => 3) + IO.expects(:select).with([], [], nil, 2) + @session.process + end + + def test_process_should_pass_wait_as_io_select_timeout_if_provided_and_minimum + @session.use('h1', :keepalive => true, :keepalive_interval => 1) + IO.expects(:select).with([], [], nil, 1) + @session.process(2) + end + + def test_process_should_pass_nil_as_io_select_timeout_by_default + @session.use('h1') + IO.expects(:select).with([], [], nil, nil) + @session.process + end end |