unicorn-worker-killer 0.3.6 → 0.4.1

data/AUTHORS

@@ -1,2 +1,3 @@
 Kazuki Ohta <kazuki.ohta _at_ gmail.com>
 Sadayuki FURUHASHI <frsyuki _at_ gmail.com>
+Jonathan Clem <jonathan _at_ jclem.net>

data/ChangeLog

@@ -1,3 +1,10 @@
+Release 0.4.1 - 2013/03/12
+  * Kill attempts happen once per request, not in a loop
+
+Release 0.4.0 - 2013/03/12
+  * Send signals from inside a Thread (required for QUIT signal)
+  * Fix broken if/else in kill_self
+
 Release 0.3.6 - 2013/03/09
   * do not require configuration
   * fix missing randomize() in MaxRequests killer

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.4.1

data/lib/unicorn/worker_killer.rb

@@ -5,28 +5,24 @@ module Unicorn::WorkerKiller
     attr_accessor :configuration
   end
 
-  # Self-destruction by sending the signals to myself. The process sometimes
-  # doesn't terminate by SIGQUIT, so this tries to send SIGTERM and SIGKILL
-  # if it doesn't finish immediately.
+  # Kill the current process by telling it to send signals to itself. If
+  # the process isn't killed after `configuration.max_quit` QUIT signals,
+  # send TERM signals until `configuration.max_term`. Finally, send a KILL
+  # signal. A single signal is sent per request.
   # @see http://unicorn.bogomips.org/SIGNALS.html
   def self.kill_self(logger, start_time)
-    alive_sec = (Time.now - start_time).to_i
-
-    i = 0
-    while true
-      i += 1
-      sig = :QUIT
-      if i > configuration.max_quit
-        sig = :TERM
-      elsif i > configuration.max_term
-        sig = :KILL
-      end
+    alive_sec = (Time.now - start_time).round
+    worker_pid = Process.pid
 
-      logger.warn "#{self} send SIG#{sig} (pid: #{Process.pid}) alive: #{alive_sec} sec (trial #{i})"
-      Process.kill sig, Process.pid
+    @@kill_attempts ||= 0
+    @@kill_attempts += 1
 
-      sleep configuration.sleep_interval
-    end
+    sig = :QUIT
+    sig = :TERM if @@kill_attempts > configuration.max_quit
+    sig = :KILL if @@kill_attempts > configuration.max_term
+
+    logger.warn "#{self} send SIG#{sig} (pid: #{worker_pid}) alive: #{alive_sec} sec (trial #{@@kill_attempts})"
+    Process.kill sig, worker_pid
   end
 
   module Oom
@@ -52,11 +48,13 @@ module Unicorn::WorkerKiller
 
     def process_client(client)
       super(client) # Unicorn::HttpServer#process_client
+
       return if @_worker_memory_limit_min == 0 && @_worker_memory_limit_max == 0
 
       @_worker_process_start ||= Time.now
       @_worker_memory_limit ||= @_worker_memory_limit_min + randomize(@_worker_memory_limit_max - @_worker_memory_limit_min + 1)
       @_worker_check_count += 1
+
       if @_worker_check_count % @_worker_check_cycle == 0
         rss = _worker_rss()
         if rss > @_worker_memory_limit
@@ -112,6 +110,7 @@ module Unicorn::WorkerKiller
         s.instance_variable_set(:@_worker_max_requests_min, max_requests_min)
         s.instance_variable_set(:@_worker_max_requests_max, max_requests_max)
       end
+
       app # pretend to be Rack middleware since it was in the past
     end
 
@@ -126,6 +125,7 @@ module Unicorn::WorkerKiller
       @_worker_process_start ||= Time.now
       @_worker_cur_requests ||= @_worker_max_requests_min + randomize(@_worker_max_requests_max - @_worker_max_requests_min + 1)
       @_worker_max_requests ||= @_worker_cur_requests
+
       if (@_worker_cur_requests -= 1) <= 0
         logger.warn "#{self}: worker (pid: #{Process.pid}) exceeds max number of requests (limit: #{@_worker_max_requests})"
         Unicorn::WorkerKiller.kill_self(logger, @_worker_process_start)

data/unicorn-worker-killer.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |gem|
   gem.homepage    = "https://github.com/kzk/unicorn-worker-killer"
   gem.summary     = gem.description
   gem.version     = File.read("VERSION").strip
-  gem.authors     = ["Kazuki Ohta", "Sadayuki Furuhashi"]
-  gem.email       = ["kazuki.ohta@gmail.com", "frsyuki@gmail.com"]
+  gem.authors     = ["Kazuki Ohta", "Sadayuki Furuhashi", "Jonathan Clem"]
+  gem.email       = ["kazuki.ohta@gmail.com", "frsyuki@gmail.com", "jonathan@jclem.net"]
   gem.has_rdoc    = false
   #gem.platform    = Gem::Platform::RUBY
   gem.files       = `git ls-files`.split("\n")

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-worker-killer
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.1
+  prerelease: 
 platform: ruby
 authors:
 - Kazuki Ohta
 - Sadayuki Furuhashi
+- Jonathan Clem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +24,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,21 +32,24 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 description: Kill unicorn workers by memory and request counts
 email:
 - kazuki.ohta@gmail.com
 - frsyuki@gmail.com
+- jonathan@jclem.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -59,25 +66,26 @@ files:
 - unicorn-worker-killer.gemspec
 homepage: https://github.com/kzk/unicorn-worker-killer
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Kill unicorn workers by memory and request counts
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 472f5a54002c4f7d424ef88e613bce3b8d0b6a12
-  data.tar.gz: 50cf272d41b6cd9bbbd9d3e2218fe189c2aac5d6
-SHA512:
-  metadata.gz: 7a5a124e1b518ebb417abc8a14f6a93202a816973a6b69073b050072193c082d071a6f6ca418b04b15b211f80327e643cccf3534452a33286df916a2aa6050bd
-  data.tar.gz: 65bb35218c266c2264d90d71c641ea872eba204a6420b98173256f67454cb301ad9170099e54e4c340c66adc2e53f54fa74d98f2bc77f334339ffb57cc59fafa