thin 1.2.1 → 1.2.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 1.2.2 I Find Your Lack of Sauce Disturbing release
+ * Fix force kill under 1.9 [Alexey Chebotar]
+ * Fix regression when --only option is used w/ --socket.
+ * Add process name 'tag' functionality. Easier to distinguish thin daemons 
+   from eachother in process listing [ctcherry]
+
 == 1.2.1 Asynctilicious Ultra Supreme release
  * Require Rack 1.0.0
  * Require EventMachine 0.12.6

data/lib/thin/controllers/cluster.rb

@@ -102,9 +102,9 @@ module Thin
       
         def with_each_server
           if only
-            if only < 80
+            if first_port && only < 80
               # interpret +only+ as a sequence number
-              yield(first_port + only)
+              yield first_port + only
             else
               # interpret +only+ as an absolute port number
               yield only

data/lib/thin/daemonizing.rb

@@ -108,16 +108,14 @@ module Thin
       
       # Send a +signal+ to the process which PID is stored in +pid_file+.
       def send_signal(signal, pid_file, timeout=60)
-        if File.file?(pid_file) && pid = File.read(pid_file)
-          pid = pid.to_i
+        if pid = read_pid_file(pid_file)
           Logging.log "Sending #{signal} signal to process #{pid} ... "
           Process.kill(signal, pid)
           Timeout.timeout(timeout) do
             sleep 0.1 while Process.running?(pid)
           end
-          Logging.log ""
         else
-          puts "Can't stop process, no PID found in #{pid_file}"
+          Logging.log "Can't stop process, no PID found in #{pid_file}"
         end
       rescue Timeout::Error
         Logging.log "Timeout!"
@@ -130,8 +128,21 @@ module Thin
       end
       
       def force_kill(pid_file)
-        Process.kill("KILL", File.read(pid_file))      rescue nil
-        File.delete(pid_file) if File.exist?(pid_file) rescue nil
+        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
+      end
+      
+      def read_pid_file(file)
+        if File.file?(file) && pid = File.read(file)
+          pid.to_i
+        else
+          nil
+        end
       end
     end
     

data/lib/thin/runner.rb

@@ -87,6 +87,7 @@ module Thin
                                       "(default: #{@options[:pid]})")                   { |file| @options[:pid] = file }
           opts.on("-u", "--user NAME", "User to run daemon as (use with -g)")           { |user| @options[:user] = user }
           opts.on("-g", "--group NAME", "Group to run daemon as (use with -u)")         { |group| @options[:group] = group }
+          opts.on(      "--tag NAME", "Additional text to display in process listing")  { |tag| @options[:tag] = tag }
                                                                                       
           opts.separator ""
           opts.separator "Cluster options:"                                             

data/lib/thin/server.rb

@@ -59,7 +59,10 @@ module Thin
         
     # Application (Rack adapter) called with the request that produces the response.
     attr_accessor :app
-    
+
+    # A tag that will show in the process listing
+    attr_accessor :tag
+
     # Backend handling the connections to the clients.
     attr_accessor :backend
     
@@ -103,6 +106,9 @@ module Thin
         end
       end
       
+      # Set tag if needed
+      self.tag = options[:tag]
+
       # Try to intelligently select which backend to use.
       @backend = select_backend(host, port, options)
       
@@ -188,7 +194,7 @@ module Thin
     # 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})"
+      "thin server (#{@backend})" + (tag ? " [#{tag}]" : "")
     end
     alias :to_s :name
     

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 1
     MINOR    = 2
-    TINY     = 1
+    TINY     = 2
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Asynctilicious Ultra Supreme".freeze
+    CODENAME = "I Find Your Lack of Sauce Disturbing".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

data/spec/controllers/cluster_spec.rb

@@ -135,6 +135,29 @@ describe Cluster, "controlling only one server" do
     end
 end
 
+describe Cluster, "controlling only one server with UNIX socket" do
+  before do
+    @cluster = Cluster.new(:chdir => '/rails_app',
+                           :socket => '/tmp/thin.sock',
+                           :address => '0.0.0.0',
+                           :port => 3000,
+                           :servers => 3,
+                           :timeout => 10,
+                           :log => 'thin.log',
+                           :pid => 'thin.pid',
+                           :only => 1
+                          )
+  end
+  
+  it 'should call only specified server' do
+    calls = []
+    @cluster.send(:with_each_server) do |n|
+      calls << n
+    end
+    calls.should == [1]
+  end
+end
+
 describe Cluster, "controlling only one server, by sequence number" do
   before do
     @cluster = Cluster.new(:chdir => '/rails_app',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-01 00:00:00 -04:00
+date: 2009-05-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -182,8 +182,6 @@ files:
 - spec/rails_app/script/process/spawner
 - spec/rails_app/script/runner
 - spec/rails_app/script/server
-- spec/rails_app/tmp
-- spec/rails_app/tmp/pids
 - spec/request
 - spec/request/mongrel_spec.rb
 - spec/request/parser_spec.rb