diff options
author | danielsdeleo <dan@getchef.com> | 2015-03-30 15:41:45 -0700 |
---|---|---|
committer | danielsdeleo <dan@getchef.com> | 2015-03-30 15:43:10 -0700 |
commit | d0e7b61728d5bf8e08fc1e40e7f2adf25fae216d (patch) | |
tree | cab7ae8afe964d4335f32b0a34a6b8b1ecb1ac49 | |
parent | 5b056eef1803c655782b5a2a5ce8caee67ffd07e (diff) | |
download | chef-zero-d0e7b61728d5bf8e08fc1e40e7f2adf25fae216d.tar.gz |
Extract socketless server map and add specssocketless
-rw-r--r-- | lib/chef_zero/server.rb | 48 | ||||
-rw-r--r-- | lib/chef_zero/socketless_server_map.rb | 84 | ||||
-rw-r--r-- | spec/socketless_server_map_spec.rb | 71 |
3 files changed, 156 insertions, 47 deletions
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb index 290cce8..9cf7b39 100644 --- a/lib/chef_zero/server.rb +++ b/lib/chef_zero/server.rb @@ -27,6 +27,7 @@ require 'webrick' require 'webrick/https' require 'chef_zero' +require 'chef_zero/socketless_server_map' require 'chef_zero/chef_data/cookbook_data' require 'chef_zero/chef_data/acl_path' require 'chef_zero/rest_router' @@ -86,53 +87,6 @@ require 'chef_zero/endpoints/not_found_endpoint' require 'chef_zero/endpoints/version_endpoint' module ChefZero - # TODO: make its own file - class SocketlessServerMap - - def self.request(port, request_env) - instance.request(port, request_env) - end - - MUTEX = Mutex.new - - include Singleton - - def initialize() - @servers_by_port = {} - end - - def register_port(port, server) - MUTEX.synchronize do - @servers_by_port[port] = server - end - end - - def register_no_listen_server(server) - MUTEX.synchronize do - 1.upto(1000) do |port| - unless @servers_by_port.key?(port) - @servers_by_port[port] = server - return i - end - end - raise "No socketless ports left to register" - end - end - - def deregister(port) - MUTEX.synchronize do - @servers_by_port.delete(port) - end - end - - def request(port, request_env) - server = @servers_by_port[port] - raise "No socketless chef-zero server on given port #{port.inspect}" unless server - server.handle_socketless_request(request_env) - end - - end - class Server DEFAULT_OPTIONS = { diff --git a/lib/chef_zero/socketless_server_map.rb b/lib/chef_zero/socketless_server_map.rb new file mode 100644 index 0000000..531dbbb --- /dev/null +++ b/lib/chef_zero/socketless_server_map.rb @@ -0,0 +1,84 @@ +# +# Author:: Daniel DeLeo (<dan@chef.io>) +# Copyright:: Copyright (c) 2012 Opscode, Inc. +# License:: Apache License, Version 2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +require 'thread' +require 'singleton' + +module ChefZero + + class ServerNotFound < StandardError + end + + class NoSocketlessPortAvailable < StandardError + end + + class SocketlessServerMap + + def self.request(port, request_env) + instance.request(port, request_env) + end + + MUTEX = Mutex.new + + include Singleton + + def initialize() + reset! + end + + def reset! + @servers_by_port = {} + end + + def register_port(port, server) + MUTEX.synchronize do + @servers_by_port[port] = server + end + end + + def register_no_listen_server(server) + MUTEX.synchronize do + 1.upto(1000) do |port| + unless @servers_by_port.key?(port) + @servers_by_port[port] = server + return port + end + end + raise NoSocketlessPortAvailable, "No socketless ports left to register" + end + end + + def has_server_on_port?(port) + @servers_by_port.key?(port) + end + + def deregister(port) + MUTEX.synchronize do + @servers_by_port.delete(port) + end + end + + def request(port, request_env) + server = @servers_by_port[port] + raise ServerNotFound, "No socketless chef-zero server on given port #{port.inspect}" unless server + server.handle_socketless_request(request_env) + end + + end +end + diff --git a/spec/socketless_server_map_spec.rb b/spec/socketless_server_map_spec.rb new file mode 100644 index 0000000..8ef2ac7 --- /dev/null +++ b/spec/socketless_server_map_spec.rb @@ -0,0 +1,71 @@ +require 'chef_zero/socketless_server_map' + + +describe "Socketless Mode" do + + let(:server_map) { ChefZero::SocketlessServerMap.instance.tap { |i| i.reset! } } + + let(:server) { instance_double("ChefZero::Server") } + + let(:second_server) { instance_double("ChefZero::Server") } + + it "registers a socketful server" do + server_map.register_port(8889, server) + expect(server_map).to have_server_on_port(8889) + end + + context "when a no-listen server is registered" do + + let!(:port) { server_map.register_no_listen_server(server) } + + it "assigns the server a low port number" do + expect(port).to eq(1) + end + + context "and another server is registered" do + + let!(:next_port) { server_map.register_no_listen_server(second_server) } + + it "assigns another port when another server is registered" do + expect(next_port).to eq(2) + end + + it "raises NoSocketlessPortAvailable when too many servers are registered" do + expect { 1000.times { server_map.register_no_listen_server(server) } }.to raise_error(ChefZero::NoSocketlessPortAvailable) + end + + it "deregisters a server" do + expect(server_map).to have_server_on_port(1) + server_map.deregister(1) + expect(server_map).to_not have_server_on_port(1) + end + + describe "routing requests to a server" do + + let(:rack_req) do + r = {} + r["REQUEST_METHOD"] = "GET" + r["SCRIPT_NAME"] = "" + r["PATH_INFO"] = "/clients" + r["QUERY_STRING"] = "" + r["rack.input"] = StringIO.new("") + r + end + + let(:rack_response) { [200, {}, ["this is the response body"] ] } + + it "routes a request to the registered port" do + expect(server).to receive(:handle_socketless_request).with(rack_req).and_return(rack_response) + response = server_map.request(1, rack_req) + expect(response).to eq(rack_response) + end + + it "raises ServerNotFound when a request is sent to an unregistered port" do + expect { server_map.request(99, rack_req) }.to raise_error(ChefZero::ServerNotFound) + end + end + end + end + + +end |