summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2009-12-14 16:41:17 -0800
committerJames Turnbull <james@lovedthanlost.net>2009-12-15 23:24:30 +1100
commit0f63a54b710e3a3390240404565515e362ce78d1 (patch)
tree36a974f6a5a78bacc7fc5692e44842941e6bf078 /lib/puppet
parent48953297137470c14ca084ec3fe8809ed3505b99 (diff)
downloadpuppet-0f63a54b710e3a3390240404565515e362ce78d1.tar.gz
puppet-0f63a54b710e3a3390240404565515e362ce78d1.tar.xz
puppet-0f63a54b710e3a3390240404565515e362ce78d1.zip
2877 race condition in webrick
Make sure that we don't try to do anything to webrick until it has really started. Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/network/http/webrick.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb
index bf4bf8859..cea7631e2 100644
--- a/lib/puppet/network/http/webrick.rb
+++ b/lib/puppet/network/http/webrick.rb
@@ -44,7 +44,8 @@ class Puppet::Network::HTTP::WEBrick
sock.accept
@server.run(sock)
}
- }
+ }
+ sleep 0.1 until @server.status == :Running
end
end