thin 1.5.0 → 1.5.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 1.5.1 Straight Razor
+ * Fix issue when running as another user/group without a PID file.
+ * Allow overriding Connection & Server response headers.
+ * Update vlad example [Mathieu Lemoine]
+ * Keep connections in a Hash to speedup deletion [slivu]
+ * Force kill using already known pid. Prevents "thin stop" from leaving a process that removed its
+   pid file, but is still running (e.g. hung on some at_exit callback) [Michal Kwiatkowski]
+
 == 1.5.0 Knife
  * Fix compilation under Ubuntu 12.04 with -Werror=format-security option.
  * Raise an error when no PID file.

data/example/vlad.rake

@@ -7,8 +7,8 @@ namespace :vlad do
   ##
   # Thin app server
 
-  set :thin_address,       "127.0.0.1"
-  set :thin_command,       'thin'
+  set :thin_address,       nil
+  set :thin_command,       "thin"
   set(:thin_conf)          { "#{shared_path}/thin_cluster.conf" }
   set :thin_environment,   "production"
   set :thin_group,         nil
@@ -19,6 +19,8 @@ namespace :vlad do
   set :thin_prefix,        nil
   set :thin_servers,       2
   set :thin_user,          nil
+  
+  set :thin_uses_bundler,  true
 
   desc "Prepares application servers for deployment. thin
 configuration is set via the thin_* variables.".cleanup
@@ -28,37 +30,43 @@ configuration is set via the thin_* variables.".cleanup
     raise(ArgumentError, "Please provide either thin_socket or thin_port") if thin_port.nil? && thin_socket.nil?
   
     cmd = [
-           "#{thin_command} config",
-           "-s #{thin_servers}",
-           ("-S #{thin_socket}" if 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),
+           "config",
+           (%(-s "#{thin_servers}") if thin_servers),
+           (%(-S "#{thin_socket}") if thin_socket),
+           (%(-e "#{thin_environment}") if thin_environment),
+           (%(-a "#{thin_address}") if thin_address),
+           %(-c "#{current_path}"),
+           (%(-C "#{thin_conf}") if 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
+    thin(cmd)
   end
 
   def thin(cmd) # :nodoc:
-    "#{thin_command} #{cmd} -C #{thin_conf}"
+    command = if thin_uses_bundler
+      %(BUNDLE_GEMFILE="#{current_path}/Gemfile" bundle exec #{thin_command} #{cmd} -C "#{thin_conf}")
+    else
+      %(#{thin_command} #{cmd} -C "#{thin_conf}")
+    end
+
+    %(cd "#{current_path}" && #{command})
   end
 
   desc "Restart the app servers"
 
   remote_task :start_app, :roles => :app do
-    run thin("restart -O -s #{thin_servers}")
+    run thin(%(restart -O -s "#{thin_servers}"))
   end
 
   desc "Stop the app servers"
 
   remote_task :stop_app, :roles => :app do
-    run thin("stop -s #{thin_servers}")
+    run thin(%(stop -s "#{thin_servers}"))
   end
 end

data/lib/thin/backends/base.rb

@@ -38,7 +38,7 @@ module Thin
       attr_accessor :no_epoll
       
       def initialize
-        @connections                    = []
+        @connections                    = {}
         @timeout                        = Server::DEFAULT_TIMEOUT
         @persistent_connection_count    = 0
         @maximum_connections            = Server::DEFAULT_MAXIMUM_CONNECTIONS
@@ -72,7 +72,7 @@ module Thin
         # Do not accept anymore connection
         disconnect
         # Close idle persistent connections
-        @connections.each { |connection| connection.close_connection if connection.idle? }
+        @connections.each_value { |connection| connection.close_connection if connection.idle? }
         stop! if @connections.empty?
       end
       
@@ -82,7 +82,7 @@ module Thin
         @stopping = false
         
         EventMachine.stop if EventMachine.reactor_running?
-        @connections.each { |connection| connection.close_connection }
+        @connections.each_value { |connection| connection.close_connection }
         close
       end
       
@@ -110,7 +110,7 @@ module Thin
       # Called by a connection when it's unbinded.
       def connection_finished(connection)
         @persistent_connection_count -= 1 if connection.can_persist?
-        @connections.delete(connection)
+        @connections.delete(connection.__id__)
         
         # Finalize gracefull stop if there's no more active connection.
         stop! if @stopping && @connections.empty?
@@ -145,7 +145,7 @@ module Thin
             @persistent_connection_count += 1
           end
 
-          @connections << connection
+          @connections[connection.__id__] = connection
         end
       
     end

data/lib/thin/daemonizing.rb

@@ -74,7 +74,7 @@ module Thin
 
       if uid != target_uid || gid != target_gid
         # Change PID file ownership
-        File.chown(target_uid, target_gid, @pid_file)
+        File.chown(target_uid, target_gid, @pid_file) if File.exists?(@pid_file)
 
         # Change process ownership
         Process.initgroups(user, target_gid)
@@ -132,22 +132,18 @@ module Thin
         end
       rescue Timeout::Error
         Logging.log "Timeout!"
-        force_kill pid_file
+        force_kill(pid, pid_file)
       rescue Interrupt
-        force_kill pid_file
+        force_kill(pid, pid_file)
       rescue Errno::ESRCH # No such process
         Logging.log "process not found!"
-        force_kill pid_file
+        force_kill(pid, pid_file)
       end
       
-      def force_kill(pid_file)
-        if pid = read_pid_file(pid_file)
-          Logging.log "Sending KILL signal to process #{pid} ... "
-          Process.kill("KILL", pid)
-          File.delete(pid_file) if File.exist?(pid_file)
-        else
-          Logging.log "Can't stop process, no PID found in #{pid_file}"
-        end
+      def force_kill(pid, pid_file)
+        Logging.log "Sending KILL signal to process #{pid} ... "
+        Process.kill("KILL", pid)
+        File.delete(pid_file) if File.exist?(pid_file)
       end
       
       def read_pid_file(file)

data/lib/thin/response.rb

@@ -33,8 +33,8 @@ module Thin
     # to be sent in the response.
     def headers_output
       # Set default headers
-      @headers[CONNECTION] = persistent? ? KEEP_ALIVE : CLOSE
-      @headers[SERVER]     = Thin::SERVER
+      @headers[CONNECTION] = persistent? ? KEEP_ALIVE : CLOSE unless @headers.has_key?(CONNECTION)
+      @headers[SERVER]     = Thin::SERVER unless @headers.has_key?(SERVER)
 
       @headers.to_s
     end

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 1
     MINOR    = 5
-    TINY     = 0
+    TINY     = 1
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Knife".freeze
+    CODENAME = "Straight Razor".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

metadata

@@ -1,60 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: thin
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.5.1
   prerelease: 
-  version: 1.5.0
 platform: ruby
-authors: 
+authors:
 - Marc-Andre Cournoyer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-22 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.6
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: daemons
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.6
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.9
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.9
 description: A thin and fast web server
 email: macournoyer@gmail.com
-executables: 
+executables:
 - thin
-extensions: 
+extensions:
 - ext/thin_parser/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGELOG
 - README.md
 - Rakefile
@@ -103,33 +115,30 @@ files:
 - ext/thin_parser/extconf.rb
 - ext/thin_parser/common.rl
 - ext/thin_parser/parser.rl
-has_rdoc: true
 homepage: http://code.macournoyer.com/thin/
-licenses: 
+licenses:
 - Ruby
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.5
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: thin
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A thin and fast web server
 test_files: []
-
+has_rdoc: