puma_worker_killer 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5655d10238db0d4a493057719a99621386373a7
-  data.tar.gz: 853a84a27a47ea134bc5812fa7a6cd4f0e2de231
+  metadata.gz: 948c271c454d3a1dc1b2bccaf270bcba98de73f8
+  data.tar.gz: 14b5ed3e5b5c28b03df31e23dc7a1047d1965a30
 SHA512:
-  metadata.gz: 8e43e8ea674c6afafa5e693ffbcf12cb07785ee1176e3b33e30f00faa536fe277903782138172a285b4e44dc264e033358b6693308d84b3dca6bc6159130b687
-  data.tar.gz: 7f2575bbde18a5250049b7af098902bed20baf08ac5e7bcbb86443b3b2d3adb6c17a3a5acaa14cbd0c8ec7380da8ef3492fa347132e7b33fb197893f9a030168
+  metadata.gz: d47c3c52bca9383936074705a88ef19e62751c183b0f086a1f004970655e5bf3b9bc934a2706013a4af3a69b160ad986371dfa36105b52acee0d6a981481f6a1
+  data.tar.gz: 683b00d578d35bc61b3450acbfb2276f438208b99f50e7951650c2348d2bdc0fc2570a5bf4f52b446131e80dc61ff21d39821c87c1cd6fe3e2768ff20cd2e58a

data/.travis.yml

@@ -3,12 +3,12 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.4
+  - 2.3.0
   - ruby-head
-  - jruby-19mode
-  - rbx-19mode
+  - rbx
 
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: rbx-19mode
-    - rvm: jruby-19mode
+    - rvm: rbx

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.6
+
+- Log PID of worker insead of inspecting the worker #33
+
 ## 0.0.5
 
 - Support for Puma 3.x

data/README.md

@@ -9,7 +9,7 @@ If you have a memory leak in your code, finding and plugging it can be a hercule
 
 Puma worker killer can only function if you have enabled cluster mode or hybrid mode (threads + worker cluster). If you are only using threads (and not workers) then puma worker killer cannot help keep your memory in control.
 
-BTW restarting your processes to controll memory is like putting a bandaid on a gunshot wound, try figuring out the reason you're seeing so much memory bloat [derailed benchmarks](https://github.com/schneems/derailed_benchmarks) can help.
+BTW restarting your processes to control memory is like putting a bandaid on a gunshot wound, try figuring out the reason you're seeing so much memory bloat [derailed benchmarks](https://github.com/schneems/derailed_benchmarks) can help.
 
 
 ## Install
@@ -52,7 +52,7 @@ end
 PumaWorkerKiller.start
 ```
 
-## Attention 
+## Attention
 If you start puma as a daemon, to add puma worker killer config into puma config file, rather than into initializers:    
 Sample like this: (in puma.rb file)
 ```ruby
@@ -98,7 +98,7 @@ By default PumaWorkerKiller will perform a rolling restart of all your worker pr
 If you're running on a platform like [Heroku where it is difficult to measure RAM from inside of a container accurately](https://github.com/schneems/get_process_mem/issues/7), you may want to disable the "worker killer" functionality and only use the rolling restart. You can do that by running:
 
 ```ruby
-PumaWorkerKiller.enable_rolling_restart
+PumaWorkerKiller.enable_rolling_restart # Default is every 6 hours
 ```
 
 or you can pass in the restart frequency

data/lib/puma_worker_killer.rb

@@ -7,7 +7,7 @@ module PumaWorkerKiller
   self.ram           = 512  # mb
   self.frequency     = 10   # seconds
   self.percent_usage = 0.99 # percent of RAM to use
-  self.rolling_restart_frequency = 6 * 3600
+  self.rolling_restart_frequency = 6 * 3600 # 6 hours in seconds
 
   def config
     yield self

data/lib/puma_worker_killer/reaper.rb

@@ -13,10 +13,10 @@ module PumaWorkerKiller
     def reap
       return false unless @cluster.running?
       if (total = get_total_memory) > @max_ram
-        @cluster.master.log "PumaWorkerKiller: Out of memory. #{@cluster.workers.count} workers consuming total: #{total} mb out of max: #{@max_ram} mb. Sending TERM to #{@cluster.largest_worker.inspect} consuming #{@cluster.largest_worker_memory} mb."
+        @cluster.master.log "PumaWorkerKiller: Out of memory. #{@cluster.workers.count} workers consuming total: #{total} mb out of max: #{@max_ram} mb. Sending TERM to pid #{@cluster.largest_worker.pid} consuming #{@cluster.largest_worker_memory} mb."
         @cluster.term_largest_worker
       else
-        @cluster.master.log "PumaWorkerKiller: Consuming #{total} mb with master and #{@cluster.workers.count} workers"
+        @cluster.master.log "PumaWorkerKiller: Consuming #{total} mb with master and #{@cluster.workers.count} workers."
       end
     end
   end

data/lib/puma_worker_killer/rolling_restart.rb

@@ -12,7 +12,7 @@ module PumaWorkerKiller
     def reap(wait_between_worker_kill = 60) # seconds
       return false unless @cluster.running?
       @cluster.workers.each do |worker, ram|
-        @cluster.master.log "PumaWorkerKiller: Rolling Restart. #{@cluster.workers.count} workers consuming total: #{ get_total_memory } mb out of max: #{@max_ram} mb. Sending TERM to #{worker.inspect}"
+        @cluster.master.log "PumaWorkerKiller: Rolling Restart. #{@cluster.workers.count} workers consuming total: #{ get_total_memory } mb out of max: #{@max_ram} mb. Sending TERM to pid #{worker.pid}."
         worker.term
         sleep wait_between_worker_kill
       end

data/lib/puma_worker_killer/version.rb

@@ -1,3 +1,3 @@
 module PumaWorkerKiller
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma_worker_killer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma