thin 0.6.4 → 0.7.0

data/spec/controllers/controller_spec.rb

@@ -4,7 +4,13 @@ include Controllers
 
 describe Controller, 'start' do
   before do
-    @controller = Controller.new(:address => '0.0.0.0', :port => 3000, :pid => 'thin.pid', :log => 'thin.log', :timeout => 60)
+    @controller = Controller.new(:address              => '0.0.0.0',
+                                 :port                 => 3000,
+                                 :pid                  => 'thin.pid',
+                                 :log                  => 'thin.log',
+                                 :timeout              => 60,
+                                 :max_conns            => 2000,
+                                 :max_persistent_conns => 1000)
     
     @server = OpenStruct.new
     @adapter = OpenStruct.new
@@ -19,7 +25,8 @@ describe Controller, 'start' do
     @server.app.should == @adapter
     @server.pid_file.should == 'thin.pid'
     @server.log_file.should == 'thin.log'
-    @server.timeout.should == 60
+    @server.maximum_connections.should == 2000
+    @server.maximum_persistent_connections.should == 1000
   end
   
   it "should start as daemon" do
@@ -62,14 +69,19 @@ describe Controller, 'start' do
 end
 
 describe Controller do
+  before do
+    @controller = Controller.new(:pid => 'thin.pid', :timeout => 10)
+    @controller.stub!(:wait_for_file)
+  end
+  
   it "should stop" do
     Server.should_receive(:kill).with('thin.pid', 10)
-    Controller.new(:pid => 'thin.pid', :timeout => 10).stop
+    @controller.stop
   end
   
   it "should restart" do
     Server.should_receive(:restart).with('thin.pid')
-    Controller.new(:pid => 'thin.pid').restart
+    @controller.restart
   end
   
   it "should write configuration file" do

data/spec/controllers/service_spec.rb

@@ -14,7 +14,6 @@ describe Service do
     FileUtils.mkdir_p 'tmp/sandbox'
         
     @service = Service.new(:all => 'spec/configs')
-    @service.silent = true
   end
   
   it "should call command for each config file" do

data/spec/logging_spec.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class TestLogging
+  include Logging
+end
+
+describe Logging do
+  before do
+    Logging.silent = false
+    @object = TestLogging.new
+  end
+  
+  it "should output debug when set to true" do
+    Logging.debug = true
+    @object.should_receive(:puts)
+    @object.debug 'hi'
+  end
+
+  it "should output trace when set to true" do
+    Logging.trace = true
+    @object.should_receive(:puts)
+    @object.trace 'hi'
+  end
+
+  it "should not output when silenced" do
+    Logging.silent = true
+    @object.should_not_receive(:puts)
+    @object.log 'hi'
+  end
+  
+  it "should not output when silenced [deprecated]" do
+    @object.should_receive(:warn)
+    @object.silent = true
+    
+    @object.should_not_receive(:puts)
+    @object.log 'hi'
+  end
+  
+  after do
+    Logging.silent = true
+  end
+end

data/spec/request/persistent_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Request, 'persistent' do
+  before do
+    @request = Request.new
+  end
+  
+  it "should not assume that a persistent connection is maintained for HTTP version 1.0" do
+    @request.env['HTTP_VERSION'] = 'HTTP/1.0'
+    @request.should_not be_persistent
+  end
+
+  it "should assume that a persistent connection is maintained for HTTP version 1.0 when specified" do
+    @request.env['HTTP_VERSION'] = 'HTTP/1.0'
+    @request.env['HTTP_CONNECTION'] = 'Keep-Alive'
+    @request.should be_persistent
+  end
+  
+  it "should maintain a persistent connection for HTTP/1.1 client" do
+    @request.env['HTTP_VERSION'] = 'HTTP/1.1'
+    @request.env['HTTP_CONNECTION'] = 'Keep-Alive'
+    @request.should be_persistent
+  end
+
+  it "should maintain a persistent connection for HTTP/1.1 client by default" do
+    @request.env['HTTP_VERSION'] = 'HTTP/1.1'
+    @request.should be_persistent
+  end
+
+  it "should not maintain a persistent connection for HTTP/1.1 client when Connection header include close" do
+    @request.env['HTTP_VERSION'] = 'HTTP/1.1'
+    @request.env['HTTP_CONNECTION'] = 'close'
+    @request.should_not be_persistent
+  end
+end

data/spec/response_spec.rb

@@ -63,6 +63,24 @@ EOS
     proc { @response.each { |l| l } }.should be_faster_then(0.00011)
   end
   
+  it "should not be persistent by default" do
+    @response.should_not be_persistent
+  end
+  
+  it "should not be persistent when no Content-Length" do
+    @response = Response.new
+    @response.headers['Content-Type'] = 'text/html'
+    @response.body = ''
+    
+    @response.persistent!
+    @response.should_not be_persistent
+  end
+  
+  it "should be persistent when specified" do
+    @response.persistent!
+    @response.should be_persistent
+  end
+  
   it "should be closeable" do
     @response.close
   end

data/spec/server/pipelining_spec.rb

@@ -0,0 +1,108 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Server, "HTTP pipelining" do
+  before do
+    calls = 0
+    start_server do |env|
+      calls += 1
+      body = env['PATH_INFO'] + '-' + calls.to_s
+      [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
+    end
+    @server.maximum_persistent_connections = 1024
+  end
+  
+  it "should pipeline request on same socket" do
+    socket = TCPSocket.new('0.0.0.0', 3333)
+    socket.write "GET /first HTTP/1.1\r\nConnection: keep-alive\r\n\r\n"
+    socket.flush
+    socket.write "GET /second HTTP/1.1\r\nConnection: close\r\n\r\n"
+    response = socket.read
+    socket.close
+    
+    wait_for_requests_to_complete!
+    
+    response.should include('/first-1', '/second-2')
+  end
+  
+  it "should pipeline requests by default on HTTP 1.1" do
+    socket = TCPSocket.new('0.0.0.0', 3333)
+    socket.write "GET /first HTTP/1.1\r\n\r\n"
+    socket.flush
+    socket.write "GET /second HTTP/1.1\r\nConnection: close\r\n\r\n"
+    response = socket.read
+    socket.close
+    
+    wait_for_requests_to_complete!
+    
+    response.should include('/first-1', '/second-2')
+  end
+  
+  it "should not pipeline request by default on HTTP 1.0" do
+    socket = TCPSocket.new('0.0.0.0', 3333)
+    socket.write "GET /first HTTP/1.0\r\n\r\n"
+    socket.flush
+    socket.write "GET /second HTTP/1.0\r\nConnection: close\r\n\r\n"
+    response = socket.read
+    socket.close
+    
+    wait_for_requests_to_complete!
+    
+    response.should include('/first-1')
+    response.should_not include('/second-2')
+  end
+  
+  it "should not pipeline request on same socket when connection is closed" do
+    socket = TCPSocket.new('0.0.0.0', 3333)
+    socket.write "GET /first HTTP/1.1\r\nConnection: close\r\n\r\n"
+    socket.flush
+    socket.write "GET /second HTTP/1.1\r\nConnection: close\r\n\r\n"
+    response = socket.read
+    socket.close
+    
+    wait_for_requests_to_complete!
+    
+    response.should include('/first-1')
+    response.should_not include('/second-2')
+  end
+  
+  it "should not allow more persistent connection then maximum" do
+    @server.maximum_persistent_connections = 1
+    
+    socket1 = TCPSocket.new('0.0.0.0', 3333)
+    socket1.write "GET / HTTP/1.1\r\n\r\n"
+    socket1.flush
+    socket2 = TCPSocket.new('0.0.0.0', 3333)    
+    socket2.write "GET / HTTP/1.1\r\n\r\n"
+    socket2.flush
+    
+    @server.connector.persistent_connection_count.should == 1
+    @server.connector.size.should == 2
+    
+    socket1.close    
+    socket2.close
+  end
+  
+  it "should decrement persistent connection on close" do
+    socket = TCPSocket.new('0.0.0.0', 3333)
+    socket.write "GET / HTTP/1.1\r\n\r\n"
+    socket.flush
+    
+    @server.connector.persistent_connection_count.should == 1
+    
+    socket.write "GET / HTTP/1.1\r\nConnection: close\r\n\r\n"
+    socket.close
+    
+    wait_for_requests_to_complete!
+    
+    @server.connector.persistent_connection_count.should == 0
+  end
+  
+  after do
+    stop_server
+  end
+  
+  private
+    def wait_for_requests_to_complete!
+      sleep 0.1 until @server.connector.size == 0
+    end
+end

data/spec/server/swiftiply.yml

@@ -0,0 +1,6 @@
+cluster_address: 0.0.0.0
+cluster_port: 3333
+map:
+  - incoming: 127.0.0.1
+    outgoing: 127.0.0.1:5555
+    default: true 

data/spec/server/swiftiply_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Server, 'on Swiftiply' do
+  before do
+    @swiftiply = fork do
+      exec "swiftiply -c #{File.dirname(__FILE__)}/swiftiply.yml"
+    end
+    sleep 0.5
+    start_server(Connectors::SwiftiplyClient.new('0.0.0.0', 5555, nil)) do |env|
+      body = env.inspect + env['rack.input'].read
+      [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
+    end
+  end
+    
+  it 'should GET from Net::HTTP' do
+    Net::HTTP.get(URI.parse("http://0.0.0.0:3333/?cthis")).should include('cthis')
+  end
+  
+  it 'should POST from Net::HTTP' do
+    Net::HTTP.post_form(URI.parse("http://0.0.0.0:3333/"), :arg => 'pirate').body.should include('arg=pirate')
+  end
+  
+  after do
+    stop_server
+    Process.kill(9, @swiftiply)
+  end
+end

data/spec/server/tcp_spec.rb

@@ -13,7 +13,7 @@ describe Server, 'on TCP socket' do
   end
   
   it 'should GET from TCPSocket' do
-    send_data("GET /?this HTTP/1.1\r\n\r\n").
+    send_data("GET /?this HTTP/1.1\r\nConnection: close\r\n\r\n").
       should include("HTTP/1.1 200 OK",
                      "Content-Type: text/html", "Content-Length: ",
                      "Connection: close", "this")
@@ -24,7 +24,7 @@ describe Server, 'on TCP socket' do
   end
   
   it 'should return empty string on incorrect Content-Length' do
-    send_data("POST / HTTP/1.1\r\nContent-Length: 300\r\n\r\naye").should be_empty
+    send_data("POST / HTTP/1.1\r\nContent-Length: 300\r\nConnection: close\r\n\r\naye").should be_empty
   end
   
   it 'should POST from Net::HTTP' do
@@ -36,7 +36,7 @@ describe Server, 'on TCP socket' do
     post('/', :big => big).should include(big)
   end
   
-  it "should handle GET in less then #{get_request_time = 0.004} RubySecond" do
+  it "should handle GET in less then #{get_request_time = 0.0045} RubySecond" do
     proc { get('/') }.should be_faster_then(get_request_time)
   end
   

data/spec/server_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Server do
+  before do
+    @server = Server.new('0.0.0.0', 3000)
+  end
+  
+  it "should set descriptor table size" do
+    @server.should_receive(:log).once
+    @server.maximum_connections = 100
+    @server.set_descriptor_table_size!
+    @server.maximum_connections.should == 100
+  end
+
+  it "should warn when descriptor table size too large" do
+    @server.stub!(:log)
+    @server.should_receive(:log).with(/^!!/)
+    @server.maximum_connections = 100_000
+    @server.set_descriptor_table_size!
+    @server.maximum_connections.should < 100_000
+  end
+end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ include Thin
 
 FileUtils.mkdir_p File.dirname(__FILE__) + '/../log'
 Command.script = File.dirname(__FILE__) + '/../bin/thin'
+Logging.silent = true
 
 module Matchers
   class BeFasterThen
@@ -138,10 +139,9 @@ module Helpers
   def start_server(*args, &app)
     @server = Thin::Server.new(args[0] || '0.0.0.0', args[1] || 3333, app)
     @server.timeout = 3
-    @server.silent = true
     
     @thread = Thread.new { @server.start }
-    sleep 0.1 until @thread.status == 'sleep'
+    sleep 0.1 until @server.running? && EventMachine.reactor_running?
   end
   
   def stop_server
@@ -163,7 +163,7 @@ module Helpers
   
   def get(url)
     if @server.connector.class == Connectors::UnixServer
-      send_data("GET #{url} HTTP/1.1\r\n\r\n")
+      send_data("GET #{url} HTTP/1.1\r\nConnection: close\r\n\r\n")
     else
       Net::HTTP.get(URI.parse("http://#{@server.host}:#{@server.port}" + url))
     end

data/tasks/gem.rake

@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency        'rack',         '>= 0.2.0'
   s.add_dependency        'eventmachine', '>= 0.8.1'
   unless WIN
-    s.add_dependency        'daemons',      '>= 1.0.9'
+    s.add_dependency      'daemons',      '>= 1.0.9'
   end
 
   s.files                 = %w(COPYING CHANGELOG README Rakefile) +

data/tasks/spec.rake

@@ -11,6 +11,15 @@ else
   desc "Run all examples"
   Spec::Rake::SpecTask.new('spec') do |t|
     t.spec_files = FileList['spec/**/*_spec.rb']
+    if WIN
+      t.spec_files -= [
+          'spec/connectors/unix_server_spec.rb',
+          'spec/controllers/service_spec.rb',
+          'spec/daemonizing_spec.rb',
+          'spec/server/unix_socket_spec.rb',
+          'spec/server/swiftiply_spec.rb'
+          ]
+    end
   end
   
   task :check_spec_gems do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-13 00:00:00 -05:00
+date: 2008-02-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,9 +52,9 @@ files:
 - CHANGELOG
 - README
 - Rakefile
-- benchmark/previous.rb
-- benchmark/simple.rb
-- benchmark/utils.rb
+- benchmark/abc
+- benchmark/benchmarker.rb
+- benchmark/runner
 - bin/thin
 - doc/benchmarks.txt
 - example/adapter.rb
@@ -74,6 +74,7 @@ files:
 - lib/thin/connection.rb
 - lib/thin/connectors
 - lib/thin/connectors/connector.rb
+- lib/thin/connectors/swiftiply_client.rb
 - lib/thin/connectors/tcp_server.rb
 - lib/thin/connectors/unix_server.rb
 - lib/thin/controllers
@@ -93,13 +94,13 @@ files:
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
-- lib/thin_parser.bundle
 - spec/command_spec.rb
 - spec/configs
 - spec/configs/cluster.yml
 - spec/configs/single.yml
 - spec/connection_spec.rb
 - spec/connectors
+- spec/connectors/swiftiply_client_spec.rb
 - spec/connectors/tcp_server_spec.rb
 - spec/connectors/unix_server_spec.rb
 - spec/controllers
@@ -108,6 +109,7 @@ files:
 - spec/controllers/service_spec.rb
 - spec/daemonizing_spec.rb
 - spec/headers_spec.rb
+- spec/logging_spec.rb
 - spec/rack_rails_spec.rb
 - spec/rails_app
 - spec/rails_app/app
@@ -172,14 +174,19 @@ files:
 - spec/request/mongrel_spec.rb
 - spec/request/parser_spec.rb
 - spec/request/perf_spec.rb
+- spec/request/persistent_spec.rb
 - spec/request/processing_spec.rb
 - spec/response_spec.rb
 - spec/runner_spec.rb
 - spec/server
 - spec/server/builder_spec.rb
+- spec/server/pipelining_spec.rb
 - spec/server/stopping_spec.rb
+- spec/server/swiftiply.yml
+- spec/server/swiftiply_spec.rb
 - spec/server/tcp_spec.rb
 - spec/server/unix_socket_spec.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb
 - tasks/announce.rake
 - tasks/deploy.rake