RubyGems - thin - Versions diffs - 0.7.0-x86-mswin32-60 → 0.7.1-x86-mswin32-60 - Mend

thin 0.7.0-x86-mswin32-60 → 0.7.1-x86-mswin32-60

Potentially problematic release.

This version of thin might be problematic. Click here for more details.

Files changed (47) hide show

data/CHANGELOG +11 -1
data/COMMITTERS +3 -0
data/README +4 -0
data/Rakefile +2 -0
data/ext/thin_parser/thin.c +9 -0
data/lib/thin.rb +5 -5
data/lib/thin/backends/base.rb +114 -0
data/lib/thin/{connectors → backends}/swiftiply_client.rb +6 -6
data/lib/thin/{connectors → backends}/tcp_server.rb +2 -2
data/lib/thin/{connectors → backends}/unix_server.rb +19 -8
data/lib/thin/connection.rb +3 -3
data/lib/thin/controllers/controller.rb +6 -5
data/lib/thin/controllers/service.rb +3 -1
data/lib/thin/daemonizing.rb +20 -7
data/lib/thin/logging.rb +1 -1
data/lib/thin/request.rb +5 -5
data/lib/thin/server.rb +63 -78
data/lib/thin/version.rb +4 -2
data/lib/thin_parser.so +0 -0
data/spec/{connectors → backends}/swiftiply_client_spec.rb +10 -10
data/spec/{connectors → backends}/tcp_server_spec.rb +5 -5
data/spec/backends/unix_server_spec.rb +37 -0
data/spec/command_spec.rb +1 -0
data/spec/connection_spec.rb +1 -1
data/spec/controllers/controller_spec.rb +1 -0
data/spec/daemonizing_spec.rb +31 -23
data/spec/{request/perf_spec.rb → perf/request_perf_spec.rb} +0 -0
data/spec/perf/response_perf_spec.rb +19 -0
data/spec/perf/server_perf_spec.rb +39 -0
data/spec/request/mongrel_spec.rb +1 -1
data/spec/response_spec.rb +0 -11
data/spec/runner_spec.rb +4 -4
data/spec/server/builder_spec.rb +8 -3
data/spec/server/pipelining_spec.rb +6 -5
data/spec/server/swiftiply_spec.rb +25 -20
data/spec/server/tcp_spec.rb +1 -9
data/spec/server/unix_socket_spec.rb +1 -5
data/spec/server_spec.rb +4 -7
data/spec/spec_helper.rb +29 -5
data/tasks/announce.rake +2 -2
data/tasks/email.erb +13 -15
data/tasks/ext.rake +28 -24
data/tasks/gem.rake +8 -4
data/tasks/spec.rake +14 -9
metadata +19 -15
data/lib/thin/connectors/connector.rb +0 -73
data/spec/connectors/unix_server_spec.rb +0 -43

data/spec/{request/perf_spec.rb → perf/request_perf_spec.rb} RENAMED

File without changes

data/spec/perf/response_perf_spec.rb ADDED

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+describe Response, 'performance' do
+  before do
+    @response = Response.new
+    @response.body = ''
+  end
+  it "should be fast" do
+    @response.body << <<-EOS
+<html><head><title>Dir listing</title></head>
+<body><h1>Listing stuff</h1><ul>
+#{'<li>Hi!</li>' * 100}
+</ul></body></html>
+EOS
+    proc { @response.each { |l| l } }.should be_faster_then(0.00011)
+  end
+end

data/spec/perf/server_perf_spec.rb ADDED

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+describe Server, 'performance' do
+  before do
+    start_server do |env|
+      body = env.inspect + env['rack.input'].read
+      [200, { 'Content-Length' => body.size.to_s }, body]
+    end
+  end
+  it "should handle GET in less then #{get_request_time = 0.0045} RubySecond" do
+    proc { get('/') }.should be_faster_then(get_request_time)
+  end
+  it "should handle POST in less then #{post_request_time = 0.007} RubySecond" do
+    proc { post('/', :file => 'X' * 1000) }.should be_faster_then(post_request_time)
+  end
+  after do
+    stop_server
+  end
+end
+describe Server, 'UNIX socket performance' do
+  before do
+    start_server('/tmp/thin_test.sock') do |env|
+      body = env.inspect + env['rack.input'].read
+      [200, { 'Content-Length' => body.size.to_s }, body]
+    end
+  end
+  it "should handle GET in less then #{get_request_time = 0.002} RubySecond" do
+    proc { get('/') }.should be_faster_then(get_request_time)
+  end
+  after do
+    stop_server
+  end
+end

data/spec/request/mongrel_spec.rb CHANGED

@@ -8,7 +8,7 @@ describe Request, 'legacy Mongrel tests' do
   end
   it 'should raise error on large mangled field values' do
-    proc { R("GET /#{rand_data(10,120)} HTTP/1.1\r\nX-Test: #{rand_data(1024, 100*1024+(1024), false)}\r\n\r\n") }.
+    proc { R("GET /#{rand_data(10,120)} HTTP/1.1\r\nX-Test: #{rand_data(1024, 1024*1024, false)}\r\n\r\n") }.
       should raise_error(InvalidRequest)
   end

data/spec/response_spec.rb CHANGED

@@ -51,18 +51,7 @@ describe Response do
     @response.each { |l| out << l }
     out.should include("\r\n\r\n<html></html>")
   end
-  it "should be fast" do
-    @response.body << <<-EOS
-<html><head><title>Dir listing</title></head>
-<body><h1>Listing stuff</h1><ul>
-#{'<li>Hi!</li>' * 100}
-</ul></body></html>
-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

data/spec/runner_spec.rb CHANGED

@@ -36,7 +36,7 @@ describe Runner do
     controller = mock('controller')
     controller.should_receive(:start)
-    Controller.should_receive(:new).and_return(controller)
+    Controllers::Controller.should_receive(:new).and_return(controller)
     runner.run!
   end
@@ -46,7 +46,7 @@ describe Runner do
     controller = mock('cluster')
     controller.should_receive(:start)
-    Cluster.should_receive(:new).and_return(controller)
+    Controllers::Cluster.should_receive(:new).and_return(controller)
     runner.run!
   end
@@ -84,7 +84,7 @@ describe Runner, 'with config file' do
     controller = mock('controller')
     controller.should_receive(:respond_to?).with('start').and_return(true)
     controller.should_receive(:start)
-    Cluster.should_receive(:new).and_return(controller)
+    Controllers::Cluster.should_receive(:new).and_return(controller)
     expected_dir = File.expand_path('spec/rails_app')
     begin
@@ -106,7 +106,7 @@ describe Runner, "service" do
     Thin.stub!(:linux?).and_return(true)
     @controller = mock('service')
-    Service.stub!(:new).and_return(@controller)
+    Controllers::Service.stub!(:new).and_return(@controller)
   end
   it "should use Service controller when controlling all servers" do

data/spec/server/builder_spec.rb CHANGED

@@ -28,11 +28,16 @@ describe Server, 'app builder' do
   it "should work with Rack url mapper" do
     server = Server.new '0.0.0.0', 3000 do
       map '/test' do
-        run(proc { |env| :works })
+        run(proc { |env| [200, {}, 'Found /test'] })
       end
     end
-    server.app.call({})[0].should == 404
-    server.app.call({'PATH_INFO' => '/test'}).should == :works
+    default_env = { 'SCRIPT_NAME' => '' }
+    server.app.call(default_env.update('PATH_INFO' => '/'))[0].should == 404
+    status, headers, body = server.app.call(default_env.update('PATH_INFO' => '/test'))
+    status.should == 200
+    body.should == 'Found /test'
   end
 end

data/spec/server/pipelining_spec.rb CHANGED

@@ -29,6 +29,7 @@ describe Server, "HTTP pipelining" do
     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"
+    socket.flush
     response = socket.read
     socket.close
@@ -75,8 +76,8 @@ describe Server, "HTTP pipelining" do
     socket2.write "GET / HTTP/1.1\r\n\r\n"
     socket2.flush
-    @server.connector.persistent_connection_count.should == 1
-    @server.connector.size.should == 2
+    @server.backend.persistent_connection_count.should == 1
+    @server.backend.size.should == 2
     socket1.close
     socket2.close
@@ -87,14 +88,14 @@ describe Server, "HTTP pipelining" do
     socket.write "GET / HTTP/1.1\r\n\r\n"
     socket.flush
-    @server.connector.persistent_connection_count.should == 1
+    @server.backend.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
+    @server.backend.persistent_connection_count.should == 0
   end
   after do
@@ -103,6 +104,6 @@ describe Server, "HTTP pipelining" do
   private
     def wait_for_requests_to_complete!
-      sleep 0.1 until @server.connector.size == 0
+      sleep 0.1 until @server.backend.size == 0
     end
 end

data/spec/server/swiftiply_spec.rb CHANGED

@@ -1,27 +1,32 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-describe Server, 'on Swiftiply' do
-  before do
-    @swiftiply = fork do
-      exec "swiftiply -c #{File.dirname(__FILE__)}/swiftiply.yml"
+if SWIFTIPLY_PATH.empty?
+  warn "Ignoring Server on Swiftiply specs, gem install swiftiply to run"
+else
+  describe Server, 'on Swiftiply' do
+    before do
+      @swiftiply = fork do
+        exec "#{SWIFTIPLY_PATH} -c #{File.dirname(__FILE__)}/swiftiply.yml"
+      end
+      wait_for_socket('0.0.0.0', 3333)
+      sleep 2 # HACK ooh boy, I wish I knew how to make those specs more stable...
+      start_server(Backends::SwiftiplyClient.new('0.0.0.0', 5555, nil), nil, false) do |env|
+        body = env.inspect + env['rack.input'].read
+        [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
+      end
     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 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
+    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)
+    after do
+      stop_server
+      Process.kill(9, @swiftiply)
+    end
   end
-end
+end

data/spec/server/tcp_spec.rb CHANGED

@@ -35,15 +35,7 @@ describe Server, 'on TCP socket' do
     big = 'X' * (20 * 1024)
     post('/', :big => big).should include(big)
   end
-  it "should handle GET in less then #{get_request_time = 0.0045} RubySecond" do
-    proc { get('/') }.should be_faster_then(get_request_time)
-  end
-  it "should handle POST in less then #{post_request_time = 0.007} RubySecond" do
-    proc { post('/', :file => 'X' * 1000) }.should be_faster_then(post_request_time)
-  end
   it "should retreive remote address" do
     get('/').should include('"REMOTE_ADDR"=>"127.0.0.1"')
   end

data/spec/server/unix_socket_spec.rb CHANGED

@@ -12,11 +12,7 @@ describe Server, "on UNIX domain socket" do
   end
   it "should retreive remote address" do
-    get('/').should include('"REMOTE_ADDR"=>""') # Is that right?
-  end
-  it "should handle GET in less then #{get_request_time = 0.002} RubySecond" do
-    proc { get('/') }.should be_faster_then(get_request_time)
+    get('/').should include('"REMOTE_ADDR"=>"127.0.0.1"')
   end
   it "should remove socket file after server stops" do

data/spec/server_spec.rb CHANGED

@@ -5,18 +5,15 @@ describe Server do
     @server = Server.new('0.0.0.0', 3000)
   end
-  it "should set descriptor table size" do
-    @server.should_receive(:log).once
+  it "should set maximum_connections size" do
     @server.maximum_connections = 100
-    @server.set_descriptor_table_size!
+    @server.config
     @server.maximum_connections.should == 100
   end
-  it "should warn when descriptor table size too large" do
-    @server.stub!(:log)
-    @server.should_receive(:log).with(/^!!/)
+  it "should set lower maximum_connections size when too large" do
     @server.maximum_connections = 100_000
-    @server.set_descriptor_table_size!
+    @server.config
     @server.maximum_connections.should < 100_000
   end
 end

data/spec/spec_helper.rb CHANGED

@@ -14,6 +14,8 @@ FileUtils.mkdir_p File.dirname(__FILE__) + '/../log'
 Command.script = File.dirname(__FILE__) + '/../bin/thin'
 Logging.silent = true
+SWIFTIPLY_PATH = `which swiftiply`.chomp unless Object.const_defined?(:SWIFTIPLY_PATH)
 module Matchers
   class BeFasterThen
     def initialize(max_time)
@@ -136,21 +138,43 @@ module Helpers
     request
   end
-  def start_server(*args, &app)
-    @server = Thin::Server.new(args[0] || '0.0.0.0', args[1] || 3333, app)
+  def start_server(address='0.0.0.0', port=3333, wait_for_socket=true, &app)
+    @server = Thin::Server.new(address, port, app)
     @server.timeout = 3
     @thread = Thread.new { @server.start }
-    sleep 0.1 until @server.running? && EventMachine.reactor_running?
+    if wait_for_socket
+      wait_for_socket(address, port)
+    else
+      # If we can't ping the address fallback to just wait for the server to run
+      sleep 1 until @server.running?
+    end
   end
   def stop_server
     @server.stop!
     @thread.kill
+    raise "Reactor still running, wtf?" if EventMachine.reactor_running?
+  end
+  def wait_for_socket(address='0.0.0.0', port=3333, timeout=5)
+    Timeout.timeout(timeout) do
+      loop do
+        begin
+          if address.include?('/')
+            UNIXSocket.new(address).close
+          else
+            TCPSocket.new(address, port).close
+          end
+          return true
+        rescue
+        end
+      end
+    end
   end
   def send_data(data)
-    if @server.connector.class == Connectors::UnixServer
+    if @server.backend.class == Backends::UnixServer
       socket = UNIXSocket.new(@server.socket)
     else
       socket = TCPSocket.new(@server.host, @server.port)
@@ -162,7 +186,7 @@ module Helpers
   end
   def get(url)
-    if @server.connector.class == Connectors::UnixServer
+    if @server.backend.class == Backends::UnixServer
       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))

data/tasks/announce.rake CHANGED

@@ -1,7 +1,7 @@
 require 'erb'
 MSG_TEMPLATE = File.dirname(__FILE__) + '/email.erb'
-SEND_TO      = %w(thin-ruby@googlegroups.com eventmachine-talk@rubyforge.org Rubymtl@lists.artengine.ca ruby-talk@ruby-lang.org montreal-on-rails@googlegroups.com)
+SEND_TO      = %w(thin-ruby@googlegroups.com eventmachine-talk@rubyforge.org ruby-talk@ruby-lang.org montreal-on-rails@googlegroups.com)
 desc 'Generate a template for the new version annoucement'
 task :ann do
@@ -14,7 +14,7 @@ Subject: [ANN] Thin #{Thin::VERSION::STRING} #{Thin::VERSION::CODENAME} release
 #{msg}
 END_OF_MESSAGE
-  `echo "#{body}" | mate`
+  fork { `echo "#{body}" | mate` }
 end
 def changelog

data/tasks/email.erb CHANGED

@@ -1,34 +1,32 @@
 Hey all,
-Version <%= Thin::VERSION::STRING %> (codename <%= Thin::VERSION::CODENAME %>) of the fastest Ruby server is out!
-http://code.macournoyer.com/thin/
+Thin version <%= Thin::VERSION::STRING %> (codename <%= Thin::VERSION::CODENAME %>) is out!
 == What's new?
 <%= changelog %>
 == Get it!
+Install Thin from RubyForge:
- sudo gem install thin
+ gem install thin
 Or using my mirror:
- sudo gem install thin --source http://code.macournoyer.com
-WARNING:
-  Thin is still alpha software, if you use it on your server you understand the
-  risks that are involved.
+ gem install thin --source http://code.macournoyer.com
-== Contribute
+To use Thin with UNIX domain sockets you need EventMachine 0.11.0 from my gem server:
-If you're using Thin, let me know and I'll put your site on http://code.macournoyer.com/thin/users/
+ gem install eventmachine --source http://code.macournoyer.com
-Thin is driven by an active community of passionate coders and benchmarkers.
-Please join us, contribute or share some ideas in Thin Google Group:
-http://groups.google.com/group/thin-ruby/topics
+== Contribute
-Also on IRC: #thin on freenode
+Site:  http://code.macournoyer.com/thin/
+Group: http://groups.google.com/group/thin-ruby/topics
+Bugs:  http://thin.lighthouseapp.com/projects/7212-thin
+Code:  http://github.com/macournoyer/thin
+IRC:   #thin on freenode
 Thanks to all the people who contributed to Thin, EventMachine, Rack and Mongrel.

data/tasks/ext.rake CHANGED

@@ -1,19 +1,35 @@
 CLEAN.include %w(**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log} ext/*/Makefile ext/*/conftest.dSYM)
-EXT_DIR    = 'ext/thin_parser'
-EXT_BUNDLE = "#{EXT_DIR}/thin_parser.#{Config::CONFIG['DLEXT']}"
-EXT_FILES  = FileList[
-  "#{EXT_DIR}/*.c",
-  "#{EXT_DIR}/*.h",
-  "#{EXT_DIR}/*.rl",
-  "#{EXT_DIR}/extconf.rb",
-  "#{EXT_DIR}/Makefile",
-  "lib"
-]
+def ext_task(name)
+  ext_dir    = "ext/#{name}"
+  ext_bundle = "#{ext_dir}/#{name}.#{Config::CONFIG['DLEXT']}"
+  ext_files  = FileList[
+    "#{ext_dir}/*.c",
+    "#{ext_dir}/*.h",
+    "#{ext_dir}/*.rl",
+    "#{ext_dir}/extconf.rb",
+    "#{ext_dir}/Makefile",
+    "lib"
+  ]
+  task "compile:#{name}" => ["#{ext_dir}/Makefile", ext_bundle]
+  task :compile => "compile:#{name}"
+  file "#{ext_dir}/Makefile" => ["#{ext_dir}/extconf.rb"] do
+    cd(ext_dir) { ruby "extconf.rb" }
+  end
+  file ext_bundle => ext_files do
+    cd ext_dir do
+      sh(WIN ? 'nmake' : 'make')
+    end
+    cp ext_bundle, 'lib/'
+  end
+end
 desc "Compile the Ragel state machines"
 task :ragel do
-  Dir.chdir EXT_DIR do
+  Dir.chdir 'ext/thin_parser' do
     target = "parser.c"
     File.unlink target if File.exist? target
     sh "ragel parser.rl | rlgen-cd -G2 -o #{target}"
@@ -22,17 +38,5 @@ task :ragel do
 end
 desc "Compile the extensions"
-task :compile => ["#{EXT_DIR}/Makefile", EXT_BUNDLE]
+task :compile
 task :package => :compile
-file "#{EXT_DIR}/Makefile" => ["#{EXT_DIR}/extconf.rb"] do
-  cd(EXT_DIR) { ruby "extconf.rb" }
-end
-file EXT_BUNDLE => EXT_FILES do
-  cd EXT_DIR do
-    sh(WIN ? 'nmake' : 'make')
-  end
-  cp EXT_BUNDLE, 'lib/'
-end