unicorn-worker-killer 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 420acce9af285728e9a01073187ff9a30d04c59f
-  data.tar.gz: 3c64abf746d3b61cb62bffd8b9d504ec43ba62fb
-!binary "U0hBNTEy":
-  metadata.gz: 5e3eb914600705eb38a473e6f87cab3433647be992248bffe1c4c4e6472cc03f689e34473dd087e72a359102d0d9979ab8773d347283722179f40ae8f0146f45
-  data.tar.gz: d094e7db25d113ff730551ac538b4ccee4dd0bea1ae65629ab36fee762bdddbf40ea8a0ef31e03430dabd4383d98fbac08273eba970b8dfc9fca69a669625427
+SHA1:
+  metadata.gz: c797670bfc0ae3167daa7fe1182233559315ff54
+  data.tar.gz: 2eef704073a541d87d25d67f2db032a4ab1a4e49
+SHA512:
+  metadata.gz: 2e2ae23ab3aa77ead7054cc95142750dc48395922c357d37fb705cef2c65c325bce849dcd450b0a1ad6b6d5671014dc818d62ff3c2821858d963904e2bb76187
+  data.tar.gz: 571aafd204e1f2e02b782dc64d47531213f941b09737561750313e5aa4fb0f227187720ed355fc8d3eee9d3b2a089799f4609be63733b24b84032434db202722

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.4.3 - 2013/12/23
+  * fix for occasional 'invalid argument' error
+
+Release 0.4.2 - 2013/09/23
+  * `verbose` options provides verbose logging
+
 Release 0.4.1 - 2013/03/12
   * Kill attempts happen once per request, not in a loop
 

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/unicorn/worker_killer.rb

@@ -1,4 +1,5 @@
 require 'unicorn/configuration'
+require 'get_process_mem'
 
 module Unicorn::WorkerKiller
   class << self
@@ -44,7 +45,7 @@ module Unicorn::WorkerKiller
     end
 
     def randomize(integer)
-      RUBY_VERSION > "1.9" ? Random.rand(integer) : rand(integer)
+      RUBY_VERSION > "1.9" ? Random.rand(integer.abs) : rand(integer)
     end
 
     def process_client(client)
@@ -54,9 +55,8 @@ module Unicorn::WorkerKiller
       @_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()
+        rss = GetProcessMem.new.bytes
         logger.info "#{self}: worker (pid: #{Process.pid}) using #{rss} bytes." if @_verbose
         if rss > @_worker_memory_limit
           logger.warn "#{self}: worker (pid: #{Process.pid}) exceeds memory limit (#{rss} bytes > #{@_worker_memory_limit} bytes)"
@@ -65,38 +65,6 @@ module Unicorn::WorkerKiller
         @_worker_check_count = 0
       end
     end
-
-    private
-
-    def _worker_rss
-      proc_status = "/proc/#{Process.pid}/status"
-      if File.exists? proc_status
-        open(proc_status).each_line { |l|
-          if l.include? 'VmRSS'
-            ls = l.split
-            if ls.length == 3
-              value = ls[1].to_i
-              unit = ls[2]
-              case unit.downcase
-              when 'kb'
-                return value*(1024**1)
-              when 'mb'
-                return value*(1024**2)
-              when 'gb'
-                return value*(1024**3)
-              end
-            end
-          end
-        }
-      end
-
-      # Forking the child process sometimes fails under low memory condition.
-      # It would be ideal for not forking the process to get RSS. For Linux,
-      # this module reads '/proc/<pid>/status' to get RSS, but not for other
-      # environments (e.g. MacOS and Windows).
-      kb = `ps -o rss= -p #{Process.pid}`.to_i
-      return kb * 1024
-    end
   end
 
   module MaxRequests
@@ -117,7 +85,7 @@ module Unicorn::WorkerKiller
     end
 
     def randomize(integer)
-      RUBY_VERSION > "1.9" ? Random.rand(integer) : rand(integer)
+      RUBY_VERSION > "1.9" ? Random.rand(integer.abs) : rand(integer)
     end
 
     def process_client(client)

data/unicorn-worker-killer.gemspec

@@ -14,7 +14,9 @@ Gem::Specification.new do |gem|
   gem.files       = `git ls-files`.split("\n")
   gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.licenses    = ["GPLv2+", "Ruby 1.8"]
   gem.require_paths = ['lib']
-  gem.add_dependency "unicorn", "~> 4"
+  gem.add_dependency "unicorn",         "~> 4"
+  gem.add_dependency "get_process_mem", "~> 0"
   gem.add_development_dependency "rake", ">= 0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-worker-killer
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Kazuki Ohta
@@ -10,34 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: get_process_mem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 description: Kill unicorn workers by memory and request counts
@@ -60,7 +74,9 @@ files:
 - lib/unicorn/worker_killer.rb
 - unicorn-worker-killer.gemspec
 homepage: https://github.com/kzk/unicorn-worker-killer
-licenses: []
+licenses:
+- GPLv2+
+- Ruby 1.8
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -68,17 +84,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Kill unicorn workers by memory and request counts