Merge branch 'master' into master

zombocom · Aug 18, 2020 · 7ff5a67 · 7ff5a67
2 parents 75d1a7e + 0a637f8
commit 7ff5a67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - Simplify workers memory calculation in PumaMemory‘s `get_total` method #81
 - Add `pre_term`-like `rolling_pre_term` config for terminations caused by rolling restart (#86)
+- Fix compatibility with ruby version 2.3.X (#87)
 
 ## 0.1.1
 

diff --git a/lib/puma_worker_killer/puma_memory.rb b/lib/puma_worker_killer/puma_memory.rb
@@ -54,7 +54,7 @@ def largest_worker_memory
     # Will refresh @workers
     def get_total(workers = set_workers)
       master_memory = GetProcessMem.new(Process.pid).mb
-      worker_memory = workers.values.sum
+      worker_memory = workers.values.inject(:+) || 0
       worker_memory + master_memory
     end
     alias :get_total_memory :get_total