unicorn-worker-killer 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e9021aa4840a7f7ad56c19a11bd0af9831950cc
-  data.tar.gz: 2e1efded731931d091ec2af81b21a50d2d718f7d
+  metadata.gz: a62e19d2cacf4fa0c1156246c9b045b7c9a9910d
+  data.tar.gz: 4c15e610631cac77d7e96221f071f2fb441efcb1
 SHA512:
-  metadata.gz: 97876ad6dc0067f64786630caeba653ab33789d3522c62c3e623627e6266336572aef812a30a9e532cd139f298c9f4ef2aacb8357bf1c13662edaee43f26007f
-  data.tar.gz: be739847d6a972f223631216f67f14082c5fddf6a603808285db688b8a8d58e524925949bf11fd940b9c18385b7915599af8ef7ba15a76f7a06f010e4803bb9c
+  metadata.gz: 2d9b47622f9b2f57e5b392b706dd3f2ef9e216bee03a5a5b908c0fc99fcff2963980568cbb36f94ad7d49f7006c5f971dd38fb481b76b8a10eb109c5c3041740
+  data.tar.gz: 1822892d9f269ee1f9c524b1326f972876c5f44e1e6f646189020dcf8ab7ee9406fa02c933dad1930f21e0eb3b175854d9372b633bb2e469bda00b7d7b1cc6f3

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.3.5 - 2013/03/08
+  * configurable max QUIT, TERM, and sleep interval
+  * fix warning message of signal handling
+
 Release 0.3.4 - 2013/03/08
   * try SIGQUIT first, rather than SIGTERM
 

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/unicorn/configuration.rb

@@ -0,0 +1,11 @@
+module Unicorn::WorkerKiller
+  class Configuration
+    attr_accessor :max_quit, :max_term, :sleep_interval
+
+    def initialize
+      self.max_quit = 10
+      self.max_term = 15
+      self.sleep_interval = 1
+    end
+  end
+end

data/lib/unicorn/worker_killer.rb

@@ -1,7 +1,10 @@
+require 'unicorn/configuration'
+
 module Unicorn::WorkerKiller
   # Self-destruction by sending the signals to myself. The process sometimes
-  # doesn't terminate by SIGTERM, so this tries to send SIGQUIT and SIGKILL
+  # doesn't terminate by SIGQUIT, so this tries to send SIGTERM and SIGKILL
   # if it doesn't finish immediately.
+  # @see http://unicorn.bogomips.org/SIGNALS.html
   def self.kill_self(logger, start_time)
     alive_sec = (Time.now - start_time).to_i
 
@@ -9,16 +12,16 @@ module Unicorn::WorkerKiller
     while true
       i += 1
       sig = :QUIT
-      if i > 10     # TODO configurable QUIT MAX
+      if i > configuration.max_quit
         sig = :TERM
-      elsif i > 15  # TODO configurable TERM MAX
+      elsif i > configuration.max_term
         sig = :KILL
       end
 
-      logger.warn "#{self} send SIGTERM (pid: #{Process.pid}) alive: #{alive_sec} sec (trial #{i})"
+      logger.warn "#{self} send SIG#{sig} (pid: #{Process.pid}) alive: #{alive_sec} sec (trial #{i})"
       Process.kill sig, Process.pid
 
-      sleep 1  # TODO configurable sleep
+      sleep configuration.sleep_interval
     end
   end
 
@@ -120,4 +123,13 @@ module Unicorn::WorkerKiller
       end
     end
   end
+
+  def self.configure
+    self.configuration ||= Configuration.new
+    yield(configuration) if block_given?
+  end
+
+  class << self
+    attr_accessor :configuration
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-worker-killer
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Kazuki Ohta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn
@@ -54,6 +54,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- lib/unicorn/configuration.rb
 - lib/unicorn/worker_killer.rb
 - unicorn-worker-killer.gemspec
 homepage: https://github.com/kzk/unicorn-worker-killer