unicorn_wrangler 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54d7b9a72c24b04921b1166ba43b368c42165a2e
-  data.tar.gz: df7a4c53a340a8399f0463a71f35be907d0b6785
+  metadata.gz: 1f72e32d0f738e4a21905f59649fde3906f7fb69
+  data.tar.gz: bd03778e2a04de0023ca93e5ad84b9a7a5f64c47
 SHA512:
-  metadata.gz: 9890df840242eddf6cb7e4f7843240436cfc0b9eef194f40ac35b9f42d42b24966a9c57e6cedd34d09d6d38dc5dab0839a9410e750a86658a12bbc34f81b0e74
-  data.tar.gz: 2089a8b26d54f74e90bafaf1cffe558c5290c835460765b06ed1abcb19eae935f43d49a683344729b76ac6b2e59501c52283121b50be8c3cf963901a158841ac
+  metadata.gz: 25e32ab650825a5c57bd71bda348ca6178945d4828c6e2cfcc839f6c2b0d299b8197d2c2b98a688e1fefcd4e80d7ffd8df1bb2f6f2e07b30cf3e6653d19675d6
+  data.tar.gz: a33421c807480547c3508fdbcff4e03e87b46a15e20735146194b16a087cb664b4bdaa635f357523409de7c64dce8434fbaa9ea51366421e929c9467a9f1049d

data/lib/unicorn_wrangler.rb

@@ -67,7 +67,7 @@ module UnicornWrangler
         @stats.histogram("#{STATS_NAMESPACE}.kill.total_request_time", request_time)
       end
 
-      @logger.info "Killing unicorn worker ##{Process.pid} for #{reason}. Requests: #{requests}, Time: #{request_time}, Memory: #{memory}MB"
+      report_status "Killing", reason, memory, requests, request_time
 
       Process.kill(:QUIT, Process.pid)
     end
@@ -76,6 +76,10 @@ module UnicornWrangler
     def used_memory
       `ps -o rss= -p #{Process.pid}`.to_i / 1024
     end
+
+    def report_status(status, reason, memory, requests, request_time)
+      @logger.info "#{status} unicorn worker ##{Process.pid} for #{reason}. Requests: #{requests}, Time: #{request_time}, Memory: #{memory}MB"
+    end
   end
 
   class OutOfMemoryKiller < Killer
@@ -88,8 +92,13 @@ module UnicornWrangler
 
     def call(requests, request_time)
       return unless (requests % @check_every).zero? # avoid overhead of checking memory too often
-      return unless (memory = used_memory) > @max
-      kill :memory, memory, requests, request_time
+      memory = used_memory
+      if memory > @max
+        kill :memory, memory, requests, request_time
+      else
+        @stats.histogram("#{STATS_NAMESPACE}.keep.memory", memory)
+        report_status "Keeping", :memory, memory, requests, request_time
+      end
     end
   end
 

data/lib/unicorn_wrangler/version.rb

@@ -1,3 +1,3 @@
 module UnicornWrangler
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicorn_wrangler
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it