diff options
author | Jonas Kongslund <jonas@kongslund.net> | 2015-05-27 00:07:42 +0400 |
---|---|---|
committer | Jonas Kongslund <jonas@kongslund.net> | 2015-05-27 00:07:42 +0400 |
commit | e18dac65098b3b6156f1d1d4b64fd97ca93b7ba0 (patch) | |
tree | 7433bad3f64b5be0d723f0be2e258f0a57b5f008 | |
parent | fdf63f101fd2810ac9159a61fc34f8bb0697bd12 (diff) | |
download | chef-zero-e18dac65098b3b6156f1d1d4b64fd97ca93b7ba0.tar.gz |
Increase WEBrick request timeout to 300 seconds. Fixes #137
-rw-r--r-- | lib/chef_zero/server.rb | 1 | ||||
-rw-r--r-- | spec/server_spec.rb | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb index 9cf7b39..2b72c67 100644 --- a/lib/chef_zero/server.rb +++ b/lib/chef_zero/server.rb @@ -248,6 +248,7 @@ module ChefZero :DoNotListen => true, :AccessLog => [], :Logger => WEBrick::Log.new(StringIO.new, 7), + :RequestTimeout => 300, :SSLEnable => options[:ssl], :SSLCertName => [ [ 'CN', WEBrick::Utils::getservername ] ], :StartCallback => proc { diff --git a/spec/server_spec.rb b/spec/server_spec.rb index 558ef35..f088941 100644 --- a/spec/server_spec.rb +++ b/spec/server_spec.rb @@ -26,6 +26,10 @@ describe ChefZero::Server do expect { ChefZero::Server.new(:port => 8889.upto(8889)).start_background }.to raise_error Errno::EADDRINUSE end + it 'has a very patient request timeout' do + expect(@server.server.config[:RequestTimeout]).to eq 300 + end + context 'accept headers' do def get_nodes(accepts) uri = URI(@server.url) |