summaryrefslogtreecommitdiff
path: root/lib/custodian
diff options
context:
space:
mode:
authorIan Chilton <ian.chilton@bytemark.co.uk>2018-07-11 13:26:06 +0100
committerIan Chilton <ian.chilton@bytemark.co.uk>2018-07-11 13:26:06 +0100
commitcfc6baff141da1962fb357b7a56db9403a732c18 (patch)
tree9410ef46dbb7d7ca4d3583b8a64a231511312722 /lib/custodian
parentc42a0bef7d7194989cdacc317409fa4ac0b802a0 (diff)
parentcbe814134b871dd2df13e7f5b60ff931694a1273 (diff)
Merge branch '23-fallback-ssl-timeout' into 'master'HEADmasterlocking_for_custodian_add_test_script
Resolve "The fallback SSL certificate check occasionally hogs a dequeue thread (potentially forever)" Closes #23 See merge request open-source/custodian!16
Diffstat (limited to 'lib/custodian')
-rw-r--r--lib/custodian/protocoltest/ssl.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/custodian/protocoltest/ssl.rb b/lib/custodian/protocoltest/ssl.rb
index 82754c6..209fff0 100644
--- a/lib/custodian/protocoltest/ssl.rb
+++ b/lib/custodian/protocoltest/ssl.rb
@@ -166,7 +166,7 @@ class SSLCheck
in_cert = false
# Run the command.
- out = `echo "" | openssl s_client -servername #{uri.host} -connect #{uri.host}:#{uri.port} 2>/dev/null`
+ out = `echo "" | timeout --kill-after=12s 10s openssl s_client -servername #{uri.host} -connect #{uri.host}:#{uri.port} 2>/dev/null`
# For each line of the output
out.split( /[\r\n]/ ).each do |line|