friendlyfashion-thin 1.4.1 → 1.4.1.1

data/lib/thin/backends/base.rb

@@ -13,30 +13,30 @@ module Thin
     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
-      
+
       # Allow using threads in the backend.
       attr_writer :threaded
       def threaded?; @threaded end
-      
+
       # Allow using SSL in the backend.
       attr_writer :ssl, :ssl_options
       def ssl?; @ssl end
-      
+
       # Number of persistent connections currently opened
       attr_accessor :persistent_connection_count
-      
+
       # Disable the use of epoll under Linux
       attr_accessor :no_epoll
-      
+
       def initialize
         @connections                    = []
         @timeout                        = Server::DEFAULT_TIMEOUT
@@ -47,7 +47,7 @@ module Thin
         @ssl                            = nil
         @threaded                       = nil
       end
-      
+
       # Start the backend and connect it.
       def start
         @stopping = false
@@ -55,7 +55,7 @@ module Thin
           connect
           @running = true
         end
-        
+
         # Allow for early run up of eventmachine.
         if EventMachine.reactor_running?
           starter.call
@@ -63,67 +63,72 @@ module Thin
           EventMachine.run(&starter)
         end
       end
-      
+
       # Stop of the backend from accepting new connections.
       def stop
         @running  = false
         @stopping = true
-        
+
         # Do not accept anymore connection
         disconnect
         stop! if @connections.empty?
       end
-      
+
       # Force stop of the backend NOW, too bad for the current connections.
       def stop!
         @running  = false
         @stopping = false
-        
+
         EventMachine.stop if EventMachine.reactor_running?
         @connections.each { |connection| connection.close_connection }
         close
       end
-      
+
       # Configure the backend. This method will be called before droping superuser privileges,
       # so you can do crazy stuff that require godlike powers here.
       def config
         # See http://rubyeventmachine.com/pub/rdoc/files/EPOLL.html
         EventMachine.epoll unless @no_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
-      
+
       # Returns +true+ if the backend is connected and running.
       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
-      
+
+      # connection list.
+      def connections_list
+        @connections
+      end
+
       protected
         # Initialize a new connection to a client.
         def initialize_connection(connection)
@@ -131,7 +136,7 @@ module Thin
           connection.app                     = @server.app
           connection.comm_inactivity_timeout = @timeout
           connection.threaded                = @threaded
-          
+
           if @ssl
             connection.start_tls(@ssl_options)
           end
@@ -145,7 +150,7 @@ module Thin
 
           @connections << connection
         end
-      
+
     end
   end
 end

data/lib/thin/controllers/cluster.rb

@@ -3,7 +3,7 @@ require 'socket'
 module Thin
   # An exception class to handle the event that server didn't start on time
   class RestartTimeout < RuntimeError; end
-  
+
   module Controllers
     # Control a set of servers.
     # * Generate start and stop commands and run them.
@@ -13,17 +13,17 @@ module Thin
       # Cluster only options that should not be passed in the command sent
       # to the indiviual servers.
       CLUSTER_OPTIONS = [:servers, :only, :onebyone, :wait]
-      
+
       # Maximum wait time for the server to be restarted
       DEFAULT_WAIT_TIME = 30    # seconds
-      
+
       # Create a new cluster of servers launched using +options+.
       def initialize(options)
         super
         # Cluster can only contain daemonized servers
         @options.merge!(:daemonize => true)
       end
-      
+
       def first_port; @options[:port]     end
       def address;    @options[:address]  end
       def socket;     @options[:socket]   end
@@ -33,35 +33,35 @@ module Thin
       def only;       @options[:only]     end
       def onebyone;   @options[:onebyone] end
       def wait;       @options[:wait]     end
-      
+
       def swiftiply?
         @options.has_key?(:swiftiply)
       end
-    
+
       # Start the servers
       def start
         with_each_server { |n| start_server n }
       end
-    
+
       # Start a single server
       def start_server(number)
         log "Starting server on #{server_id(number)} ... "
-      
+
         run :start, number
       end
-  
+
       # Stop the servers
       def stop
         with_each_server { |n| stop_server n }
       end
-    
+
       # Stop a single server
       def stop_server(number)
         log "Stopping server on #{server_id(number)} ... "
-      
+
         run :stop, number
       end
-    
+
       # Stop and start the servers.
       def restart
         unless onebyone
@@ -70,7 +70,7 @@ module Thin
           sleep 0.1 # Let's breath a bit shall we ?
           start
         else
-          with_each_server do |n| 
+          with_each_server do |n|
             stop_server(n)
             sleep 0.1 # Let's breath a bit shall we ?
             start_server(n)
@@ -78,7 +78,7 @@ module Thin
           end
         end
       end
-      
+
       def test_socket(number)
         if socket
           UNIXSocket.new(socket_for(number))
@@ -88,12 +88,12 @@ module Thin
       rescue
         nil
       end
-      
+
       # Make sure the server is running before moving on to the next one.
       def wait_until_server_started(number)
         log "Waiting for server to start ..."
         STDOUT.flush # Need this to make sure user got the message
-        
+
         tries = 0
         loop do
           if test_socket = test_socket(number)
@@ -109,7 +109,7 @@ module Thin
           end
         end
       end
-    
+
       def server_id(number)
         if socket
           socket_for(number)
@@ -119,23 +119,23 @@ module Thin
           [address, number].join(':')
         end
       end
-    
+
       def log_file_for(number)
         include_server_number log_file, number
       end
-    
+
       def pid_file_for(number)
         include_server_number pid_file, number
       end
-    
+
       def socket_for(number)
         include_server_number socket, number
       end
-    
+
       def pid_for(number)
         File.read(pid_file_for(number)).chomp.to_i
       end
-      
+
       private
         # Send the command to the +thin+ script
         def run(cmd, number)
@@ -150,10 +150,10 @@ module Thin
           end
           Command.run(cmd, cmd_options)
         end
-      
+
         def with_each_server
           if only
-            if first_port && only < 80
+            if first_port && only < 1024
               # interpret +only+ as a sequence number
               yield first_port + only
             else
@@ -166,7 +166,7 @@ module Thin
             size.times { |n| yield first_port + n }
           end
         end
-      
+
         # Add the server port or number in the filename
         # so each instance get its own file
         def include_server_number(path, number)

data/lib/thin/daemonizing.rb

@@ -16,7 +16,7 @@ end
 module Thin
   # Raised when the pid file already exist starting as a daemon.
   class PidFileExist < RuntimeError; end
-  
+
   # Module included in classes that can be turned into a daemon.
   # Handle stuff like:
   # * storing the PID in a file
@@ -25,37 +25,37 @@ module Thin
   # * killing the process gracefully
   module Daemonizable
     attr_accessor :pid_file, :log_file
-    
+
     def self.included(base)
       base.extend ClassMethods
     end
-    
+
     def pid
-      File.exist?(pid_file) ? open(pid_file).read.to_i : nil
+      File.exist?(pid_file)  && !File.zero?(pid_file) ? open(pid_file).read.to_i : nil
     end
-    
+
     # Turns the current script into a daemon process that detaches from the console.
     def daemonize
       raise PlatformNotSupported, 'Daemonizing is not supported on Windows'     if Thin.win?
       raise ArgumentError,        'You must specify a pid_file to daemonize' unless @pid_file
-      
+
       remove_stale_pid_file
-      
+
       pwd = Dir.pwd # Current directory is changed during daemonization, so store it
-      
+
       # HACK we need to create the directory before daemonization to prevent a bug under 1.9
       #      ignoring all signals when the directory is created after daemonization.
       FileUtils.mkdir_p File.dirname(@pid_file)
       FileUtils.mkdir_p File.dirname(@log_file)
-      
+
       Daemonize.daemonize(File.expand_path(@log_file), name)
-      
+
       Dir.chdir(pwd)
-      
+
       write_pid_file
 
       self.after_daemonize if self.respond_to? :after_daemonize
-      
+
       at_exit do
         log ">> Exiting!"
         remove_pid_file
@@ -66,7 +66,7 @@ module Thin
     # to the specified user and group.
     def change_privilege(user, group=user)
       log ">> Changing process privilege to #{user}:#{group}"
-      
+
       uid, gid = Process.euid, Process.egid
       target_uid = Etc.getpwnam(user).uid
       target_gid = Etc.getgrnam(group).gid
@@ -83,12 +83,12 @@ module Thin
     rescue Errno::EPERM => e
       log "Couldn't change user and group to #{user}:#{group}: #{e}"
     end
-    
+
     # Register a proc to be called to restart the server.
     def on_restart(&block)
       @on_restart = block
     end
-    
+
     # Restart the server.
     def restart
       if @on_restart
@@ -99,7 +99,7 @@ module Thin
         exit!
       end
     end
-    
+
     module ClassMethods
       # Send a QUIT or INT (if timeout is +0+) signal the process which
       # PID is stored in +pid_file+.
@@ -112,12 +112,12 @@ module Thin
           send_signal('QUIT', pid_file, timeout)
         end
       end
-      
+
       # Restart the server by sending HUP signal.
       def restart(pid_file)
         send_signal('HUP', pid_file)
       end
-      
+
       # Send a +signal+ to the process which PID is stored in +pid_file+.
       def send_signal(signal, pid_file, timeout=60)
         if pid = read_pid_file(pid_file)
@@ -138,7 +138,7 @@ module Thin
         Logging.log "process not found!"
         force_kill pid_file
       end
-      
+
       def force_kill(pid_file)
         if pid = read_pid_file(pid_file)
           Logging.log "Sending KILL signal to process #{pid} ... "
@@ -148,7 +148,7 @@ module Thin
           Logging.log "Can't stop process, no PID found in #{pid_file}"
         end
       end
-      
+
       def read_pid_file(file)
         if File.file?(file) && pid = File.read(file)
           pid.to_i
@@ -157,18 +157,18 @@ module Thin
         end
       end
     end
-    
+
     protected
       def remove_pid_file
         File.delete(@pid_file) if @pid_file && File.exists?(@pid_file)
       end
-    
+
       def write_pid_file
         log ">> Writing PID to #{@pid_file}"
         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)

data/lib/thin/server.rb

@@ -12,7 +12,7 @@ module Thin
   # == UNIX domain server
   # Create a new UNIX domain socket bound to +socket+ file by specifiying a filename
   # as the first argument. Eg.: /tmp/thin.sock. If the first argument contains a <tt>/</tt>
-  # it will be assumed to be a UNIX socket. 
+  # it will be assumed to be a UNIX socket.
   #
   #   Thin::Server.start('/tmp/thin.sock', app)
   #
@@ -30,7 +30,7 @@ module Thin
   # == Building an app in place
   # If a block is passed, a <tt>Rack::Builder</tt> instance
   # will be passed to build the +app+. So you can do cool stuff like this:
-  # 
+  #
   #   Thin::Server.start('0.0.0.0', 3000) do
   #     use Rack::CommonLogger
   #     use Rack::ShowExceptions
@@ -44,19 +44,19 @@ module Thin
   # * QUIT: Gracefull shutdown (see Server#stop)
   # * INT and TERM: Force shutdown (see Server#stop!)
   # Disable signals by passing <tt>:signals => false</tt>
-  # 
+  #
   class Server
     include Logging
     include Daemonizable
     extend  Forwardable
-    
+
     # Default values
     DEFAULT_TIMEOUT                        = 30 #sec
     DEFAULT_HOST                           = '0.0.0.0'
     DEFAULT_PORT                           = 3000
     DEFAULT_MAXIMUM_CONNECTIONS            = 1024
     DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS = 100
-        
+
     # Application (Rack adapter) called with the request that produces the response.
     attr_accessor :app
 
@@ -65,38 +65,38 @@ module Thin
 
     # Backend handling the connections to the clients.
     attr_accessor :backend
-    
+
     # Maximum number of seconds for incoming data to arrive before the connection
     # is dropped.
     def_delegators :backend, :timeout, :timeout=
-    
+
     # Maximum number of file or socket descriptors that the server may open.
     def_delegators :backend, :maximum_connections, :maximum_connections=
-    
+
     # Maximum number of connection that can be persistent at the same time.
     # Most browser never close the connection so most of the time they are closed
     # when the timeout occur. If we don't control the number of persistent connection,
     # if would be very easy to overflow the server for a DoS attack.
     def_delegators :backend, :maximum_persistent_connections, :maximum_persistent_connections=
-    
+
     # Allow using threads in the backend.
     def_delegators :backend, :threaded?, :threaded=
-    
+
     # Allow using SSL in the backend.
     def_delegators :backend, :ssl?, :ssl=, :ssl_options=
-    
+
     # Address and port on which the server is listening for connections.
     def_delegators :backend, :host, :port
-    
+
     # UNIX domain socket on which the server is listening for connections.
     def_delegator :backend, :socket
-    
+
     # Disable the use of epoll under Linux
     def_delegators :backend, :no_epoll, :no_epoll=
-    
+
     def initialize(*args, &block)
       host, port, options = DEFAULT_HOST, DEFAULT_PORT, {}
-      
+
       # Guess each parameter by its type so they can be
       # received in any order.
       args.each do |arg|
@@ -108,58 +108,58 @@ module Thin
           @app = arg if arg.respond_to?(:call)
         end
       end
-      
+
       # Set tag if needed
       self.tag = options[:tag]
 
       # Try to intelligently select which backend to use.
       @backend = select_backend(host, port, options)
-      
+
       load_cgi_multipart_eof_fix
-      
+
       @backend.server = self
-      
+
       # Set defaults
       @backend.maximum_connections            = DEFAULT_MAXIMUM_CONNECTIONS
       @backend.maximum_persistent_connections = DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS
       @backend.timeout                        = DEFAULT_TIMEOUT
-      
+
       # Allow using Rack builder as a block
       @app = Rack::Builder.new(&block).to_app if block
-      
+
       # If in debug mode, wrap in logger adapter
       @app = Rack::CommonLogger.new(@app) if Logging.debug?
-      
+
       setup_signals unless options[:signals].class == FalseClass
     end
-    
+
     # Lil' shortcut to turn this:
-    # 
+    #
     #   Server.new(...).start
-    # 
+    #
     # into this:
-    # 
+    #
     #   Server.start(...)
-    # 
+    #
     def self.start(*args, &block)
       new(*args, &block).start!
     end
-        
+
     # Start the server and listen for connections.
     def start
       raise ArgumentError, 'app required' unless @app
-      
+
       log   ">> Thin web server (v#{VERSION::STRING} codename #{VERSION::CODENAME})"
       debug ">> Debugging ON"
       trace ">> Tracing ON"
-      
+
       log ">> Maximum connections set to #{@backend.maximum_connections}"
       log ">> Listening on #{@backend}, CTRL+C to stop"
-      
+
       @backend.start
     end
     alias :start! :start
-    
+
     # == Gracefull shutdown
     # Stops the server after processing all current connections.
     # As soon as this method is called, the server stops accepting
@@ -176,7 +176,7 @@ module Thin
         stop!
       end
     end
-    
+
     # == Force shutdown
     # Stops the server closing all current connections right away.
     # This doesn't wait for connection to finish their work and send data.
@@ -186,7 +186,7 @@ module Thin
 
       @backend.stop!
     end
-    
+
     # == Reopen log file.
     # Reopen the log file and redirect STDOUT and STDERR to it.
     def reopen_log
@@ -195,39 +195,47 @@ module Thin
       log ">> Reopening log file: #{file}"
       Daemonize.redirect_io(file)
     end
-    
+
     # == Configure the server
     # The process might need to have superuser privilege to configure
     # server with optimal options.
     def config
       @backend.config
     end
-    
+
     # Name of the server and type of backend used.
     # This is also the name of the process in which Thin is running as a daemon.
     def name
       "thin server (#{@backend})" + (tag ? " [#{tag}]" : "")
     end
     alias :to_s :name
-    
+
     # Return +true+ if the server is running and ready to receive requests.
     # Note that the server might still be running and return +false+ when
     # shuting down and waiting for active connections to complete.
     def running?
       @backend.running?
     end
-    
+
     # deamonizing kills our HUP signal, so we set them again
     def after_daemonize
       setup_signals
     end
 
+    def print_status
+      puts "THIN_STATUS - '#{DateTime.now.to_s}' - '#{@backend.size}' - '#{@backend}' "
+      @backend.connections_list.each do |c|
+        puts "THIN_CONNECTION: #{c.request.env['REQUEST_METHOD']} #{c.request.env['REQUEST_URI']}" unless c.request.env['REQUEST_METHOD'].nil? ||  c.request.env['REQUEST_URI'].nil?
+      end
+    end
+
     protected
       # Register signals:
       # * TERM & QUIT calls +stop+ to shutdown gracefully.
       # * INT calls <tt>stop!</tt> to force shutdown.
       # * HUP calls <tt>restart</tt> to ... surprise, restart!
       # * USR1 reopen log files.
+      # * USR2 print status.
       def setup_signals
         trap('INT')  { stop! }
         trap('TERM') { stop }
@@ -235,9 +243,10 @@ module Thin
           trap('QUIT') { stop }
           trap('HUP')  { restart }
           trap('USR1') { reopen_log }
+          trap('USR2') { print_status }
         end
       end
-      
+
       def select_backend(host, port, options)
         case
         when options.has_key?(:backend)
@@ -251,12 +260,12 @@ module Thin
           Backends::TcpServer.new(host, port)
         end
       end
-      
+
       # Taken from Mongrel cgi_multipart_eof_fix
       # Ruby 1.8.5 has a security bug in cgi.rb, we need to patch it.
       def load_cgi_multipart_eof_fix
         version = RUBY_VERSION.split('.').map { |i| i.to_i }
-        
+
         if version[0] <= 1 && version[1] <= 8 && version[2] <= 5 && RUBY_PLATFORM !~ /java/
           begin
             require 'cgi_multipart_eof_fix'

data/lib/thin/version.rb

@@ -7,8 +7,9 @@ module Thin
     MAJOR    = 1
     MINOR    = 4
     TINY     = 1
+    PATCH    = 1
     
-    STRING   = [MAJOR, MINOR, TINY].join('.')
+    STRING   = [MAJOR, MINOR, TINY, PATCH].join('.')
     
     CODENAME = "Chromeo".freeze
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendlyfashion-thin
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -122,7 +122,7 @@ files:
 - ext/thin_parser/extconf.rb
 - ext/thin_parser/parser.rl
 - ext/thin_parser/common.rl
-homepage: http://code.macournoyer.com/thin/
+homepage: https://github.com/friendlyfashion/thin
 licenses:
 - Ruby
 post_install_message: