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

data/CHANGELOG

@@ -1,3 +1,13 @@
+== 0.7.1 Fancy Pants release
+ * Clean stale PID files when starting as daemon, fixes #53 [Chu Yeow]
+ * Require EventMachine 0.11.0 for UNIX domain sockets. Until it's released, install from:
+   gem install eventmachine --source http://code.macournoyer.com
+ * Ruby 1.8.5 compatibility, closes #49 [Wincent Colaiuta]
+ * Move all EventMachine stuff out of Server, you can now create a Thin Backend that
+   does not depend on EventMachine.
+ * Rename Connector to Backend. Extend Thin::Backends::Base to implement your own.
+ * Fix high memory usage with big POST body, fixes #48
+
 == 0.7.0 Spherical Cow release
  * Add --max-persistent-conns option to sets the maximum number of persistent connections.
    Set to 0 to disable Keep-Alive.
@@ -13,7 +23,7 @@
  * --debug (-D) option no longer set $DEBUG so logging will be less verbose
    and Ruby won't be too strict, fixes #36.
  * Deprecate Server#silent in favour of Logging.silent.
- * Persistent connection (keep-alive) & HTTP pipelining support.
+ * Persistent connection (keep-alive) support.
  * Fix -s option not being included in generated config file, fixes #37.
  * Add Swiftiply support. Use w/ the --swiftiply (-y) option in the thin script,
    closes #28 [Alex MacCaw]

data/COMMITTERS

@@ -0,0 +1,3 @@
+Marc-Andre Cournoyer <macournoyer@gmail.com>
+Kevin Williams <kevwil@gmail.com>
+James Golick

data/README

@@ -10,6 +10,10 @@ Which makes it, with all humility, the most secure, stable, fast and extensible
 bundled in an easy to use gem for your own pleasure.
 
 === Installation
+IMPORTANT: Until EventMachine 0.11.0 is out, you have to install it from trunk or from my gem server:
+
+ sudo gem install eventmachine --source http://code.macournoyer.com
+
 For the latest stable version:
 
  sudo gem install thin

data/Rakefile

@@ -9,3 +9,5 @@ require 'lib/thin'
 Dir['tasks/**/*.rake'].each { |rake| load rake }
 
 task :default => :spec
+
+ext_task :thin_parser

data/ext/thin_parser/thin.c

@@ -52,6 +52,15 @@ static VALUE global_path_info;
 /** Defines global strings in the init method. */
 #define DEF_GLOBAL(N, val)   global_##N = rb_obj_freeze(rb_str_new2(val)); rb_global_variable(&global_##N)
 
+/* for compatibility with Ruby 1.8.5, which doesn't declare RSTRING_PTR */
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+
+/* for compatibility with Ruby 1.8.5, which doesn't declare RSTRING_LEN */
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
 
 /* Defines the maximum allowed lengths for various input elements.*/
 DEF_MAX_LENGTH(FIELD_NAME, 256);

data/lib/thin.rb

@@ -22,11 +22,11 @@ module Thin
   autoload :Server,             'thin/server'
   autoload :Stats,              'thin/stats'
   
-  module Connectors
-    autoload :Connector,        'thin/connectors/connector'
-    autoload :SwiftiplyClient,  'thin/connectors/swiftiply_client'
-    autoload :TcpServer,        'thin/connectors/tcp_server'
-    autoload :UnixServer,       'thin/connectors/unix_server'
+  module Backends
+    autoload :Base,             'thin/backends/base'
+    autoload :SwiftiplyClient,  'thin/backends/swiftiply_client'
+    autoload :TcpServer,        'thin/backends/tcp_server'
+    autoload :UnixServer,       'thin/backends/unix_server'
   end
   
   module Controllers

data/lib/thin/backends/base.rb

@@ -0,0 +1,114 @@
+module Thin
+  module Backends
+    # A Backend connects the server to the client. It handles:
+    # * connection/disconnection to the server
+    # * initialization of the connections
+    # * manitoring of the active connections.
+    class Base
+      # Server serving the connections throught the backend
+      attr_accessor :server
+      
+      # Maximum time for incoming data to arrive
+      attr_accessor :timeout
+      
+      # Maximum number of file or socket descriptors that the server may open.
+      attr_accessor :maximum_connections
+      
+      # Maximum number of connections that can be persistent
+      attr_accessor :maximum_persistent_connections
+      
+      # Number of persistent connections currently opened
+      attr_accessor :persistent_connection_count
+      
+      def initialize
+        @connections                    = []
+        @timeout                        = Server::DEFAULT_TIMEOUT
+        @persistent_connection_count    = 0
+        @maximum_connections            = Server::DEFAULT_MAXIMUM_CONNECTIONS
+        @maximum_persistent_connections = Server::DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS
+      end
+      
+      def start
+        @stopping = false
+        
+        EventMachine.run do
+          connect
+          @running = true
+        end
+      end
+      
+      def stop
+        @running  = false
+        @stopping = true
+        
+        # Do not accept anymore connection
+        disconnect
+        stop! if @connections.empty?
+      end
+      
+      def stop!
+        @running  = false
+        @stopping = false
+        
+        EventMachine.stop if EventMachine.reactor_running?
+        @connections.each { |connection| connection.close_connection }
+        close
+      end
+      
+      def config
+        # See http://rubyeventmachine.com/pub/rdoc/files/EPOLL.html
+        EventMachine.epoll
+        
+        # Set the maximum number of socket descriptors that the server may open.
+        # The process needs to have required privilege to set it higher the 1024 on
+        # some systems.
+        @maximum_connections = EventMachine.set_descriptor_table_size(@maximum_connections) unless Thin.win?
+      end
+      
+      # Free up resources used by the backend.
+      def close
+      end
+      
+      def running?
+        @running
+      end
+            
+      # Called by a connection when it's unbinded.
+      def connection_finished(connection)
+        @persistent_connection_count -= 1 if connection.can_persist?
+        @connections.delete(connection)
+        
+        # Finalize gracefull stop if there's no more active connection.
+        stop! if @stopping && @connections.empty?
+      end
+      
+      # Returns +true+ if no active connection.
+      def empty?
+        @connections.empty?
+      end
+      
+      # Number of active connections.
+      def size
+        @connections.size
+      end
+      
+      protected
+        # Initialize a new connection to a client.
+        def initialize_connection(connection)
+          connection.backend                 = self
+          connection.app                     = @server.app
+          connection.comm_inactivity_timeout = @timeout
+
+          # We control the number of persistent connections by keeping
+          # a count of the total one allowed yet.
+          if @persistent_connection_count < @maximum_persistent_connections
+            connection.can_persist!
+            @persistent_connection_count += 1
+          end
+
+          @connections << connection
+        end
+      
+    end
+  end
+end

data/lib/thin/{connectors → backends}/swiftiply_client.rb

@@ -1,6 +1,6 @@
 module Thin
-  module Connectors
-    class SwiftiplyClient < Connector
+  module Backends
+    class SwiftiplyClient < Base
       attr_accessor :key
       
       attr_accessor :host, :port
@@ -30,7 +30,7 @@ module Thin
 
   class SwiftiplyConnection < Connection
     def connection_completed
-      send_data swiftiply_handshake(@connector.key)
+      send_data swiftiply_handshake(@backend.key)
     end
     
     def persistent?
@@ -39,17 +39,17 @@ module Thin
     
     def unbind
       super
-      EventMachine.add_timer(rand(2)) { reconnect(@connector.host, @connector.port) } if @connector.running?
+      EventMachine.add_timer(rand(2)) { reconnect(@backend.host, @backend.port) } if @backend.running?
     end
     
     protected
       def swiftiply_handshake(key)
-        'swiftclient' << host_ip.collect { |x| sprintf('%02x', x.to_i)}.join << sprintf('%04x', @connector.port) << sprintf('%02x', key.length) << key
+        'swiftclient' << host_ip.collect { |x| sprintf('%02x', x.to_i)}.join << sprintf('%04x', @backend.port) << sprintf('%02x', key.length) << key
       end
       
       # For some reason Swiftiply request the current host
       def host_ip
-        Socket.gethostbyname(@connector.host)[3].unpack('CCCC') rescue [0,0,0,0]
+        Socket.gethostbyname(@backend.host)[3].unpack('CCCC') rescue [0,0,0,0]
       end
   end
 end

data/lib/thin/{connectors → backends}/tcp_server.rb

@@ -1,7 +1,7 @@
 module Thin
-  module Connectors
+  module Backends
     # Connectior to act as a TCP socket server.
-    class TcpServer < Connector
+    class TcpServer < Base
       # Address and port on which the server is listening for connections.
       attr_accessor :host, :port
       

data/lib/thin/{connectors → backends}/unix_server.rb

@@ -1,12 +1,13 @@
 module Thin
-  module Connectors
-    # Connector to act as a UNIX domain socket server.
-    class UnixServer < Connector
+  module Backends
+    # Backend to act as a UNIX domain socket server.
+    class UnixServer < Base
       # UNIX domain socket on which the server is listening for connections.
       attr_accessor :socket
       
       def initialize(socket)
-        raise PlatformNotSupported, 'UNIX sockets not available on Windows' if Thin.win?
+        raise PlatformNotSupported, 'UNIX domain sockets not available on Windows' if Thin.win?
+        check_event_machine_version
         @socket = socket
         super()
       end
@@ -25,7 +26,7 @@ module Thin
         EventMachine.stop_server(@signature)
       end
       
-      # Free up resources used by the connector.
+      # Free up resources used by the backend.
       def close
         remove_socket_file
       end
@@ -38,15 +39,25 @@ module Thin
         def remove_socket_file
           File.delete(@socket) if @socket && File.exist?(@socket)
         end
+        
+        def check_event_machine_version
+          # TODO remove this crap once eventmachine 0.11.0 is released
+          begin
+            gem 'eventmachine', '>= 0.11.0'
+          rescue Gem::LoadError
+            raise LoadError, "UNIX domain sockets require EventMachine version 0.11.0 or higher, " +
+                             "install the (not yet released) gem with: " +
+                             "gem install eventmachine --source http://code.macournoyer.com"
+          end
+        end
     end    
   end
 
   # Connection through a UNIX domain socket.
   class UnixConnection < Connection
     protected
-      def socket_address
-        # FIXME not sure about this, does it even make sense on a UNIX socket?
-        Socket.unpack_sockaddr_un(get_peername)
+      def socket_address        
+        '127.0.0.1' # Unix domain sockets can only be local
       end
   end
 end

data/lib/thin/connection.rb

@@ -10,8 +10,8 @@ module Thin
     # Rack application served by this connection.
     attr_accessor :app
     
-    # Connector to the server
-    attr_accessor :connector
+    # Backend to the server
+    attr_accessor :backend
     
     # Current request served by the connection
     attr_accessor :request
@@ -72,7 +72,7 @@ module Thin
     # Called when the connection is unbinded from the socket
     # and can no longer be used to process requests.
     def unbind
-      @connector.connection_finished(self)
+      @backend.connection_finished(self)
     end
     
     # Allows this connection to be persistent.

data/lib/thin/controllers/controller.rb

@@ -31,7 +31,7 @@ module Thin
         when @options.has_key?(:socket)
           Server.new(@options[:socket])
         when @options.has_key?(:swiftiply)
-          Server.new(Connectors::SwiftiplyClient.new(@options[:address], @options[:port], @options[:swiftiply]))
+          Server.new(Backends::SwiftiplyClient.new(@options[:address], @options[:port], @options[:swiftiply]))
         else
           Server.new(@options[:address], @options[:port])
         end
@@ -44,8 +44,8 @@ module Thin
 
         server.daemonize if @options[:daemonize]
 
-        # Must be called before changing privileges since it might require superuser power.
-        server.set_descriptor_table_size!
+        server.config # Must be called before changing privileges since it might require superuser power.
+        
         server.change_privilege @options[:user], @options[:group] if @options[:user] && @options[:group]
 
         # If a Rack config file is specified we eval it inside a Rack::Builder block to create
@@ -120,10 +120,10 @@ module Thin
         
         # Acts like GNU tail command. Taken from Rails.
         def tail(file)
+          cursor = File.exist?(file) ? File.size(file) : 0
+          last_checked = Time.now
           tail_thread = Thread.new do
             Thread.pass until File.exist?(file)
-            cursor = File.size(file)
-            last_checked = Time.now
             File.open(file, 'r') do |f|
               loop do
                 f.seek cursor
@@ -138,6 +138,7 @@ module Thin
               end
             end
           end
+          sleep 1 if File.exist?(file) # HACK Give the thread a little time to open the file
           tail_thread
         end
     end

data/lib/thin/controllers/service.rb

@@ -50,8 +50,10 @@ module Thin
         log "To configure thin to start at system boot:"
         log "on RedHat like systems:"
         log "  sudo /sbin/chkconfig --level 345 #{NAME} on"
-        log "on Debian like systems (Ubuntu):"
+        log "on Debian-like systems (Ubuntu):"
         log "  sudo /usr/sbin/update-rc.d -f #{NAME} defaults"
+        log "on Gentoo:"
+        log "  sudo rc-update add #{NAME} default"
         log ''
         log "Then put your config files in #{config_files_path}"
       end

data/lib/thin/daemonizing.rb

@@ -34,10 +34,10 @@ module Thin
     
     # Turns the current script into a daemon process that detaches from the console.
     def daemonize
-      raise PlatformNotSupported, 'Daemonizing not supported on Windows'     if Thin.win?
+      raise PlatformNotSupported, 'Daemonizing is not supported on Windows'     if Thin.win?
       raise ArgumentError,        'You must specify a pid_file to daemonize' unless @pid_file
-      raise PidFileExist,         "#{@pid_file} already exist, seems like it's already running. " +
-                                  "Stop the process or delete #{@pid_file}." if File.exist?(@pid_file)
+
+      remove_stale_pid_file
       
       pwd = Dir.pwd # Current directory is changed during daemonization, so store it
       
@@ -53,7 +53,7 @@ module Thin
         remove_pid_file
       end
     end
-    
+
     # Change privileges of the process
     # to the specified user and group.
     def change_privilege(user, group=user)
@@ -73,12 +73,12 @@ module Thin
       log "Couldn't change user and group to #{user}:#{group}: #{e}"
     end
     
-    # Registerer a proc to be called to restart the server.
+    # Register a proc to be called to restart the server.
     def on_restart(&block)
       @on_restart = block
     end
     
-    # Restart the server
+    # Restart the server.
     def restart
       raise ArgumentError, "Can't restart, no 'on_restart' proc specified" unless @on_restart
       log '>> Restarting ...'
@@ -108,7 +108,7 @@ module Thin
         File.delete(pid_file) if File.exist?(pid_file)
       end
       
-      # Restart the server by sending HUP signal
+      # Restart the server by sending HUP signal.
       def restart(pid_file)
         send_signal('HUP', pid_file)
       end
@@ -142,5 +142,18 @@ module Thin
         open(@pid_file,"w") { |f| f.write(Process.pid) }
         File.chmod(0644, @pid_file)
       end
+      
+      # If PID file is stale, remove it.
+      def remove_stale_pid_file
+        if File.exist?(@pid_file)
+          if pid && Process.running?(pid)
+            raise PidFileExist, "#{@pid_file} already exists, seems like it's already running (process ID: #{pid}). " +
+                                "Stop the process or delete #{@pid_file}."
+          else
+            log ">> Deleting stale PID file #{@pid_file}"
+            remove_pid_file
+          end
+        end
+      end
   end
 end

data/lib/thin/logging.rb

@@ -1,6 +1,6 @@
 module Thin
   # To be included in classes to allow some basic logging
-  # that can be silented (<tt>Logging.silent=</tt>) or made
+  # that can be silenced (<tt>Logging.silent=</tt>) or made
   # more verbose.
   # <tt>Logging.debug=</tt>: log all error backtrace and messages
   #                          logged with +debug+.

data/lib/thin/request.rb

@@ -52,7 +52,7 @@ module Thin
         # Rack stuff
         RACK_INPUT        => @body,
         
-        RACK_VERSION      => [0, 2],
+        RACK_VERSION      => VERSION::RACK,
         RACK_ERRORS       => STDERR,
         
         RACK_MULTITHREAD  => false,
@@ -65,11 +65,10 @@ module Thin
     # Raises a +InvalidRequest+ if invalid.
     # Returns +true+ if the parsing is complete.
     def parse(data)
-      @data << data
-      
       if @parser.finished?  # Header finished, can only be some more body
         body << data        
       else                  # Parse more header using the super parser
+        @data << data
         @nparsed = @parser.execute(@env, @data, @nparsed)
 
         # Transfert to a tempfile if body is very big
@@ -78,9 +77,10 @@ module Thin
       
       
       if finished?   # Check if header and body are complete
-        @body.rewind  
+        @data = nil
+        @body.rewind
         true         # Request is fully parsed
-      else            
+      else
         false        # Not finished, need more data
       end
     end