summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Duffield <tom@chef.io>2017-02-14 17:23:05 -0600
committerTom Duffield <tom@chef.io>2017-02-15 13:14:51 -0600
commita3064346957c47210307fd3464ae3027c986143f (patch)
treed10dc57649860bf17e4eee85e700c6e4ad2e6fa2
parentc5298daaec5e7729409036d1d1bb46a9532bf41a (diff)
downloadchef-zero-a3064346957c47210307fd3464ae3027c986143f.tar.gz
DO NOT MERGE
Signed-off-by: Tom Duffield <tom@chef.io>
-rw-r--r--lib/chef_zero/server.rb2
-rw-r--r--lib/chef_zero/socketless_server_map.rb3
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb
index 43b42f8..b635057 100644
--- a/lib/chef_zero/server.rb
+++ b/lib/chef_zero/server.rb
@@ -282,7 +282,7 @@ module ChefZero
@server = WEBrick::HTTPServer.new(
:DoNotListen => true,
:AccessLog => [],
- :Logger => WEBrick::Log.new(StringIO.new, 7),
+ :Logger => WEBrick::Log.new(nil, DEBUG),
:RequestTimeout => 300,
:SSLEnable => options[:ssl],
:SSLOptions => ssl_opts,
diff --git a/lib/chef_zero/socketless_server_map.rb b/lib/chef_zero/socketless_server_map.rb
index 655047a..cdfca87 100644
--- a/lib/chef_zero/socketless_server_map.rb
+++ b/lib/chef_zero/socketless_server_map.rb
@@ -51,12 +51,14 @@ module ChefZero
def register_port(port, server)
MUTEX.synchronize do
+ puts "register_port"
@servers_by_port[port] = server
end
end
def register_no_listen_server(server)
MUTEX.synchronize do
+ puts "register_no_listen_server"
1.upto(1000) do |port|
unless @servers_by_port.key?(port)
@servers_by_port[port] = server
@@ -77,6 +79,7 @@ module ChefZero
def deregister(port)
MUTEX.synchronize do
+ puts "deregister"
@servers_by_port.delete(port)
end
end