unicorn-worker-killer 0.2.1 → 0.2.2

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.2.1 - 2012/12/10
+
+  * fixed critical namespace error, introduced at the previous version
+
 Release 0.2.0 - 2012/11/22
 
   * Change namespace to Unicorn::WorkerKiller from UnicornWorkerKiller

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/unicorn/worker_killer.rb

@@ -15,7 +15,7 @@ module Unicorn::WorkerKiller
         sig = :KILL
       end
 
-      logger.warn "#{self} send SIGTERM (pid: #{Process.pid})\talive: #{alive_sec} sec (trial #{i})"
+      logger.warn "#{self} send SIGTERM (pid: #{Process.pid}) alive: #{alive_sec} sec (trial #{i})"
       Process.kill sig, Process.pid
 
       sleep 1  # TODO configurable sleep
@@ -42,14 +42,14 @@ module Unicorn::WorkerKiller
       @_worker_process_start ||= Time.now
       super(client) # Unicorn::HttpServer#process_client
 
-      c = @_worker_check_count + 1
-      if c % @_worker_check_cycle == 0
-        @_worker_check_count = 0
-        if _worker_rss() > @_worker_memory_size
+      @_worker_check_count += 1
+      if @_worker_check_count % @_worker_check_cycle == 0
+        rss = _worker_rss()
+        if rss > @_worker_memory_size
+          logger.warn "#{self}: worker (pid: #{Process.pid}) exceeds memory limit (#{rss} bytes > #{@_worker_memory_size} bytes)"
           Unicorn::WorkerKiller.kill_self(logger, @_worker_process_start)
         end
-      else
-        @_worker_check_count = c
+        @_worker_check_count = 0
       end
     end
 
@@ -95,6 +95,7 @@ module Unicorn::WorkerKiller
       ObjectSpace.each_object(Unicorn::HttpServer) do |s|
         s.extend(self)
         s.instance_variable_set(:@_worker_max_requests, max_requests)
+        s.instance_variable_set(:@_worker_cur_requests, max_requests)
       end
       app # pretend to be Rack middleware since it was in the past
     end
@@ -103,7 +104,8 @@ module Unicorn::WorkerKiller
       @_worker_process_start ||= Time.now
       super(client) # Unicorn::HttpServer#process_client
 
-      if (@_worker_max_requests -= 1) <= 0
+      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)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-worker-killer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn