Revert "Remove puma worker killer"

We've now demonstrated to my satisfaction that there is a genuine (although small) memory leak--after about 24 hours, dynos need to resort to swap. This will protect us until we can deal with the real leak later. This reverts commit d62c1fa.
rubygems · Mar 25, 2016 · 8af966d · 8af966d
1 parent 25ea732
commit 8af966d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/Gemfile b/Gemfile
@@ -15,6 +15,7 @@ gem 'metriks-librato_metrics', github: 'indirect/metriks-librato_metrics'
 gem 'metriks-middleware'
 gem 'pg'
 gem 'puma'
+gem 'puma_worker_killer'
 gem 'rack-timeout', '0.4.0.beta.1', github: 'indirect/rack-timeout'
 gem 'rake'
 gem 'dalli'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -34,6 +34,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     foreman (0.78.0)
       thor (~> 0.19.1)
+    get_process_mem (0.2.0)
     hitimes (1.2.3)
     json (1.8.3)
     librato-metrics (1.6.0)
@@ -63,6 +64,9 @@ GEM
       byebug (~> 8.0)
       pry (~> 0.10)
     puma (3.0.0)
+    puma_worker_killer (0.0.5)
+      get_process_mem (~> 0.2)
+      puma (>= 2.7, < 4)
     rack (1.6.4)
     rack-protection (1.5.3)
       rack
@@ -120,6 +124,7 @@ DEPENDENCIES
   pg
   pry-byebug
   puma
+  puma_worker_killer
   rack-test
   rack-timeout (= 0.4.0.beta.1)!
   rake

diff --git a/puma.rb b/puma.rb
@@ -5,6 +5,9 @@
 require 'bundler_api/metriks'
 BundlerApi::Metriks.start
 
+require 'puma_worker_killer'
+PumaWorkerKiller.enable_rolling_restart
+
 on_worker_boot do |index|
   BundlerApi::Metriks.start(index)
 end