diff options
author | Thom May <thom@may.lt> | 2016-07-19 18:22:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-19 18:22:23 +0100 |
commit | 1b1bc10628de4e109e3451a90069798ce7a2da98 (patch) | |
tree | fadc3bc5f7341fa62a0920f883c465ff51f10377 | |
parent | 143edc9f2911737c091c8c87a052ff2f02c05719 (diff) | |
parent | e18dac65098b3b6156f1d1d4b64fd97ca93b7ba0 (diff) | |
download | chef-zero-1b1bc10628de4e109e3451a90069798ce7a2da98.tar.gz |
Merge pull request #138 from kongslund/request-timeout
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 9c92652..19744b1 100644 --- a/lib/chef_zero/server.rb +++ b/lib/chef_zero/server.rb @@ -284,6 +284,7 @@ module ChefZero :DoNotListen => true, :AccessLog => [], :Logger => WEBrick::Log.new(StringIO.new, 7), + :RequestTimeout => 300, :SSLEnable => options[:ssl], :SSLOptions => ssl_opts, :SSLCertName => [ [ 'CN', WEBrick::Utils::getservername ] ], diff --git a/spec/server_spec.rb b/spec/server_spec.rb index d46084f..123a13e 100644 --- a/spec/server_spec.rb +++ b/spec/server_spec.rb @@ -27,6 +27,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) |