thin 0.6.3-x86-mswin32-60 → 0.6.4-x86-mswin32-60

data/CHANGELOG

@@ -1,4 +1,9 @@
+== 0.6.4 Sexy Lobster release
+ * Fix error when stopping server on UNIX domain socket, fixes #42
+ * Rescue errors in Connection#get_peername more gracefully, setting REMOTE_ADDR to nil, fixes #43
+
 == 0.6.3 Ninja Cookie release
+ * Add tasks for Vlad the Deployer in example/vlad.rake [cnantais]
  * Add Ramaze Rackup config file in example dir [tmm1]
    Use like this from you Ramaze app dir:
    
@@ -17,10 +22,10 @@
      
  * thin config --chrdir ... -C thin/yml do not change current directory anymore, fixes #33.
  * Add a better sample god config file in example/thin.god that loads all info from config
-   files in /etc/thin [Gump].
- * Add support for specifying a custom Connector to the server and a more doc about Server
+   files in /etc/thin. Drop-in replacement for the thin runlevel service [Gump].
+ * Add support for specifying a custom Connector to the server and add more doc about Server
    configuration.
- * Add a script to run thin as a system service that can start at startup, closes #31 [Gump]
+ * Add a script to run thin as a runlevel service that can start at startup, closes #31 [Gump]
    Setup the service like this:
    
      sudo thin install /etc/thin

data/example/vlad.rake

@@ -0,0 +1,61 @@
+# $GEM_HOME/gems/vlad-1.2.0/lib/vlad/thin.rb
+# Thin tasks for Vlad the Deployer
+# By cnantais
+require 'vlad'
+
+namespace :vlad do
+  ##
+  # Thin app server
+
+  set :thin_address,       "127.0.0.1"
+  set :thin_command,       'thin'
+  set(:thin_conf)          { "#{shared_path}/thin_cluster.conf" }
+  set :thin_environment,   "production"
+  set :thin_group,         nil
+  set :thin_log_file,      nil
+  set :thin_pid_file,      nil
+  set :thin_port,          nil
+  set :thin_socket,        "/tmp/thin.sock"
+  set :thin_prefix,        nil
+  set :thin_servers,       2
+  set :thin_user,          nil
+
+  desc "Prepares application servers for deployment. thin
+configuration is set via the thin_* variables.".cleanup
+
+  remote_task :setup_app, :roles => :app do
+    cmd = [
+           "#{thin_command} config",
+           "-s #{thin_servers}",
+           "-S #{thin_socket}",
+           "-e #{thin_environment}",
+           "-a #{thin_address}",
+           "-c #{current_path}",
+           "-C #{thin_conf}",
+           ("-P #{thin_pid_file}" if thin_pid_file),
+           ("-l #{thin_log_file}" if thin_log_file),
+           ("--user #{thin_user}" if thin_user),
+           ("--group #{thin_group}" if thin_group),
+           ("--prefix #{thin_prefix}" if thin_prefix),
+           ("-p #{thin_port}" if thin_port),
+          ].compact.join ' '
+
+    run cmd
+  end
+
+  def thin(cmd) # :nodoc:
+    "#{thin_command} #{cmd} -C #{thin_conf}"
+  end
+
+  desc "Restart the app servers"
+
+  remote_task :start_app, :roles => :app do
+    run thin("restart -s #{thin_servers}")
+  end
+
+  desc "Stop the app servers"
+
+  remote_task :stop_app, :roles => :app do
+    run thin("stop -s #{thin_servers}")
+  end
+end

data/lib/thin/connection.rb

@@ -11,6 +11,8 @@ module Thin
     # Connector to the server
     attr_accessor :connector
     
+    attr_accessor :request, :response
+    
     def post_init
       @request  = Request.new
       @response = Response.new
@@ -53,9 +55,11 @@ module Thin
       @connector.connection_finished(self)
     end
     
-    protected
-      def remote_address
-        @request.env[Request::FORWARDED_FOR] || Socket.unpack_sockaddr_in(get_peername)[1]
-      end
+    def remote_address
+      @request.env[Request::FORWARDED_FOR] || Socket.unpack_sockaddr_in(get_peername)[1]
+    rescue
+      log_error($!)
+      nil
+    end
   end
 end

data/lib/thin/connectors/unix_server.rb

@@ -1,6 +1,6 @@
 module Thin
   module Connectors
-    # Connectior to act as a UNIX domain socket server.
+    # Connector to act as a UNIX domain socket server.
     class UnixServer < Connector
       # UNIX domain socket on which the server is listening for connections.
       attr_accessor :socket
@@ -14,7 +14,10 @@ module Thin
       # Connect the server
       def connect
         at_exit { remove_socket_file } # In case it crashes
-        @signature = EventMachine.start_unix_domain_server(@socket, UnixConnection, &method(:initialize_connection))
+        EventMachine.start_unix_domain_server(@socket, UnixConnection, &method(:initialize_connection))
+        # HACK EventMachine.start_unix_domain_server doesn't return the connection signature
+        #      so we have to go in the internal stuff to find it.
+        @signature = EventMachine.instance_eval{@acceptors.keys.first}
       end
       
       # Stops the server
@@ -38,11 +41,14 @@ module Thin
     end    
   end
 
+  # Connection through a UNIX domain socket.
   class UnixConnection < Connection
-    protected
-      def remote_address
-        # FIXME not sure about this, does it even make sense on a UNIX socket?
-        Socket.unpack_sockaddr_un(get_peername)
-      end
+    def remote_address
+      # FIXME not sure about this, does it even make sense on a UNIX socket?
+      Socket.unpack_sockaddr_un(get_peername)
+    rescue
+      log_error($!)
+      nil
+    end
   end
 end

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 0
     MINOR    = 6
-    TINY     = 3
+    TINY     = 4
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = 'Ninja Cookie'
+    CODENAME = 'Sexy Lobster'
   end
   
   NAME    = 'thin'.freeze

data/spec/connection_spec.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Connection do
+  before do
+    @connection = Connection.new(mock('EM', :null_object => true))
+    @connection.silent = true
+    @connection.post_init
+    @connection.app = proc do |env|
+      [200, {}, ['']]
+    end
+  end
+  
+  it "should parse on receive_data" do
+    @connection.request.should_receive(:parse).with('GET')
+    @connection.receive_data('GET')
+  end
+
+  it "should close connection on InvalidRequest error in receive_data" do
+    @connection.request.stub!(:parse).and_raise(InvalidRequest)
+    @connection.should_receive(:close_connection)
+    @connection.receive_data('')
+  end
+  
+  it "should process when parsing complete" do
+    @connection.request.should_receive(:parse).and_return(true)
+    @connection.should_receive(:process)
+    @connection.receive_data('GET')
+  end
+  
+  it "should process" do
+    @connection.process
+  end
+  
+  it "should return HTTP_X_FORWARDED_FOR as remote_address" do
+    @connection.request.env['HTTP_X_FORWARDED_FOR'] = '1.2.3.4'
+    @connection.remote_address.should == '1.2.3.4'
+  end
+  
+  it "should return nil on error retreiving remote_address" do
+    @connection.stub!(:get_peername).and_raise(RuntimeError)
+    @connection.remote_address.should be_nil
+  end
+  
+  it "should return remote_address" do
+    @connection.stub!(:get_peername).and_return("\020\002?E\177\000\000\001\000\000\000\000\000\000\000\000")
+    @connection.remote_address.should == '127.0.0.1'
+  end
+end

data/spec/connectors/tcp_server_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Connectors::TcpServer do
+  before do
+    @connector = Connectors::TcpServer.new('0.0.0.0', 3333)
+  end
+  
+  it "should connect" do
+    EventMachine.run do
+      @connector.connect
+      EventMachine.stop
+    end
+  end
+  
+  it "should disconnect" do
+    EventMachine.run do
+      @connector.connect
+      @connector.disconnect
+      EventMachine.stop
+    end
+  end
+end

data/spec/connectors/unix_server_spec.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Connectors::UnixServer do
+  before do
+    @connector = Connectors::UnixServer.new('/tmp/thin-test.sock')
+  end
+  
+  it "should connect" do
+    EventMachine.run do
+      @connector.connect
+      EventMachine.stop
+    end
+  end
+  
+  it "should disconnect" do
+    EventMachine.run do
+      @connector.connect
+      @connector.disconnect
+      EventMachine.stop
+    end
+  end
+  
+  it "should remove socket file on close" do
+    @connector.close
+    File.exist?('/tmp/thin-test.sock').should be_false
+  end
+end
+
+describe UnixConnection do
+  before do
+    @connection = UnixConnection.new(nil)
+  end
+  
+  it "should return nil on error retreiving remote_address" do
+    @connection.stub!(:get_peername).and_raise(RuntimeError)
+    @connection.remote_address.should be_nil
+  end
+  
+  it "should return remote_address" do
+    @connection.stub!(:get_peername).and_return("\000\001127.0.0.1\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000")
+    @connection.remote_address.should == '127.0.0.1'
+  end
+end

data/tasks/gem.rake

@@ -74,7 +74,14 @@ namespace :gem do
       sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"
       sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}-x86-mswin32-60.gem"
     end
-  end  
+  end
+  
+  desc 'Download the Windows gem from Kevin repo'
+  task 'download:win' => 'pkg' do
+    cd 'pkg' do
+      `wget http://rubygems.bantamtech.com/ruby18/gems/#{spec.full_name}-x86-mswin32-60.gem`
+    end
+  end
 end
 
 task :install => [:clobber, :compile, :package] do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: x86-mswin32-60
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-07 00:00:00 -07:00
+date: 2008-02-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - example/monit_unixsock
 - example/ramaze.ru
 - example/thin.god
+- example/vlad.rake
 - lib/rack
 - lib/rack/adapter
 - lib/rack/adapter/rails.rb
@@ -88,6 +89,10 @@ files:
 - spec/configs
 - spec/configs/cluster.yml
 - spec/configs/single.yml
+- spec/connection_spec.rb
+- spec/connectors
+- spec/connectors/tcp_server_spec.rb
+- spec/connectors/unix_server_spec.rb
 - spec/controllers
 - spec/controllers/cluster_spec.rb
 - spec/controllers/controller_spec.rb