Hello community,
here is the log from the commit of package rubygem-puma_worker_killer for openSUSE:Factory checked in at 2019-08-06 15:10:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-puma_worker_killer (Old)
and /work/SRC/openSUSE:Factory/.rubygem-puma_worker_killer.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-puma_worker_killer"
Tue Aug 6 15:10:22 2019 rev:4 rq:717317 version:0.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-puma_worker_killer/rubygem-puma_worker_killer.changes 2017-06-08 15:01:33.419268918 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-puma_worker_killer.new.4126/rubygem-puma_worker_killer.changes 2019-08-06 15:10:29.903771197 +0200
@@ -1,0 +2,10 @@
+Fri Jul 19 09:29:56 UTC 2019 - Stephan Kulow
+
+- updated to version 0.1.1
+ see installed CHANGELOG.md
+
+ ## 0.1.1
+
+ - Allow PWK to be used with Puma 4 (#72)
+
+-------------------------------------------------------------------
Old:
----
puma_worker_killer-0.1.0.gem
New:
----
puma_worker_killer-0.1.1.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-puma_worker_killer.spec ++++++
--- /var/tmp/diff_new_pack.dk7HkL/_old 2019-08-06 15:10:30.523770910 +0200
+++ /var/tmp/diff_new_pack.dk7HkL/_new 2019-08-06 15:10:30.527770908 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-puma_worker_killer
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -24,7 +24,7 @@
#
Name: rubygem-puma_worker_killer
-Version: 0.1.0
+Version: 0.1.1
Release: 0
%define mod_name puma_worker_killer
%define mod_full_name %{mod_name}-%{version}
@@ -33,7 +33,7 @@
BuildRequires: %{ruby}
BuildRequires: ruby-macros >= 5
Url: https://github.com/schneems/puma_worker_killer
-Source: http://rubygems.org/gems/%{mod_full_name}.gem
+Source: https://rubygems.org/gems/%{mod_full_name}.gem
Source1: gem2rpm.yml
Summary: If you have a memory leak in your web code puma_worker_killer can
License: MIT
++++++ puma_worker_killer-0.1.0.gem -> puma_worker_killer-0.1.1.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.travis.yml new/.travis.yml
--- old/.travis.yml 2017-05-12 17:28:39.000000000 +0200
+++ new/.travis.yml 2019-06-26 21:06:55.000000000 +0200
@@ -2,9 +2,11 @@
rvm:
- 1.9.3
- 2.0.0
- - 2.1.0
- - 2.2.4
- - 2.3.0
+ - 2.1.10
+ - 2.2.9
+ - 2.3.6
+ - 2.4.3
+ - 2.5.0
- ruby-head
- rbx
before_install:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md
--- old/CHANGELOG.md 2017-05-12 17:28:39.000000000 +0200
+++ new/CHANGELOG.md 2019-06-26 21:06:55.000000000 +0200
@@ -1,3 +1,7 @@
+## 0.1.1
+
+- Allow PWK to be used with Puma 4 (#72)
+
## 0.1.0
- Emit extra data via `pre_term` callback before puma worker killer terminates a worker #49.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2017-05-12 17:28:39.000000000 +0200
+++ new/README.md 2019-06-26 21:06:55.000000000 +0200
@@ -1,6 +1,7 @@
# Puma Worker Killer
[](https://travis-ci.org/schneems/puma_worker_killer)
+[](https://www.codetriage.com/schneems/puma_worker_killer)
## What
@@ -66,7 +67,7 @@
end
```
-That's it. Now on a regular basis the size of all Puma and all of it's forked processes will be evaluated and if they're over the RAM threshold will be killed. Don't worry Puma will notice a process is missing a spawn a fresh copy with a much smaller RAM footprint ASAP.
+That's it. Now on a regular basis the size of all Puma and all of it's forked processes will be evaluated and if they're over the RAM threshold will be killed. Don't worry Puma will notice a process is missing and spawn a fresh copy with a much smaller RAM footprint ASAP.
## Troubleshooting
@@ -102,7 +103,7 @@
config.ram = 1024 # mb
config.frequency = 5 # seconds
config.percent_usage = 0.98
- config.rolling_restart_frequency = 12 * 3600 # 12 hours in seconds
+ config.rolling_restart_frequency = 12 * 3600 # 12 hours in seconds, or 12.hours if using Rails
config.reaper_status_logs = true # setting this to false will not log lines like:
# PumaWorkerKiller: Consuming 54.34765625 mb with master and 2 workers.
@@ -129,6 +130,12 @@
However you may want to collect more data, such as sending an event to an error collection service like rollbar or airbrake. The `pre_term` lambda gets called before any worker is killed by PWK for any reason.
+### on_calculation
+
+`config.on_calculation` will be called every time Puma Worker Killer calculates memory usage (`config.frequency`). This may be useful for monitoring your total puma application memory usage, which can be contrasted with other application monitoring solutions.
+
+This callback lambda is given a single value for the amount of memory used.
+
## Attention
If you start puma as a daemon, to add puma worker killer config into puma config file, rather than into initializers:
@@ -140,7 +147,7 @@
config.ram = 1024 # mb
config.frequency = 5 # seconds
config.percent_usage = 0.98
- config.rolling_restart_frequency = 12 * 3600 # 12 hours in seconds
+ config.rolling_restart_frequency = 12 * 3600 # 12 hours in seconds, or 12.hours if using Rails
end
PumaWorkerKiller.start
end
@@ -167,10 +174,10 @@
You may want to periodically restart all of your workers rather than simply killing your largest. To do that set:
```ruby
-PumaWorkerKiller.rolling_restart_frequency = 12 * 3600 # 12 hours in seconds
+PumaWorkerKiller.rolling_restart_frequency = 12 * 3600 # 12 hours in seconds, or 12.hours if using Rails
```
-By default PumaWorkerKiller will perform a rolling restart of all your worker processes every 12 hours. To disable, set to `false`.
+By default PumaWorkerKiller will perform a rolling restart of all your worker processes every 6 hours. To disable, set to `false`.
You may want to hide the following log lines: `PumaWorkerKiller: Consuming 54.34765625 mb with master and 2 workers.`. To do that set:
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma_worker_killer/reaper.rb new/lib/puma_worker_killer/reaper.rb
--- old/lib/puma_worker_killer/reaper.rb 2017-05-12 17:28:39.000000000 +0200
+++ new/lib/puma_worker_killer/reaper.rb 2019-06-26 21:06:55.000000000 +0200
@@ -1,10 +1,11 @@
module PumaWorkerKiller
class Reaper
- def initialize(max_ram, master = nil, reaper_status_logs = true, pre_term)
+ def initialize(max_ram, master = nil, reaper_status_logs = true, pre_term = nil, on_calculation = nil)
@cluster = PumaWorkerKiller::PumaMemory.new(master)
@max_ram = max_ram
@reaper_status_logs = reaper_status_logs
@pre_term = pre_term
+ @on_calculation = on_calculation
end
# used for tes
@@ -14,7 +15,10 @@
def reap
return false if @cluster.workers_stopped?
- if (total = get_total_memory) > @max_ram
+ total = get_total_memory
+ @on_calculation.call(total) unless @on_calculation.nil?
+
+ if total > @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 pid #{@cluster.largest_worker.pid} consuming #{@cluster.largest_worker_memory} mb."
# Fetch the largest_worker so that both `@pre_term` and `term_worker` are called with the same worker
@@ -25,7 +29,7 @@
# A new request comes in, Worker B takes it, and consumes 101 mb memory
# term_largest_worker (previously here) gets called and terms Worker B (thus not passing the about-to-be-terminated worker to `@pre_term`)
largest_worker = @cluster.largest_worker
- @pre_term.call(largest_worker)
+ @pre_term.call(largest_worker) unless @pre_term.nil?
@cluster.term_worker(largest_worker)
elsif @reaper_status_logs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma_worker_killer/version.rb new/lib/puma_worker_killer/version.rb
--- old/lib/puma_worker_killer/version.rb 2017-05-12 17:28:39.000000000 +0200
+++ new/lib/puma_worker_killer/version.rb 2019-06-26 21:06:55.000000000 +0200
@@ -1,3 +1,3 @@
module PumaWorkerKiller
- VERSION = "0.1.0"
+ VERSION = "0.1.1"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma_worker_killer.rb new/lib/puma_worker_killer.rb
--- old/lib/puma_worker_killer.rb 2017-05-12 17:28:39.000000000 +0200
+++ new/lib/puma_worker_killer.rb 2019-06-26 21:06:55.000000000 +0200
@@ -3,20 +3,21 @@
module PumaWorkerKiller
extend self
- attr_accessor :ram, :frequency, :percent_usage, :rolling_restart_frequency, :reaper_status_logs, :pre_term
+ attr_accessor :ram, :frequency, :percent_usage, :rolling_restart_frequency, :reaper_status_logs, :pre_term, :on_calculation
self.ram = 512 # mb
self.frequency = 10 # seconds
self.percent_usage = 0.99 # percent of RAM to use
self.rolling_restart_frequency = 6 * 3600 # 6 hours in seconds
self.reaper_status_logs = true
- self.pre_term = lambda { |_| } # nop
+ self.pre_term = nil
+ self.on_calculation = nil
def config
yield self
end
- def reaper(ram = self.ram, percent = self.percent_usage, reaper_status_logs = self.reaper_status_logs, pre_term = self.pre_term)
- Reaper.new(ram * percent_usage, nil, reaper_status_logs, pre_term)
+ def reaper(ram = self.ram, percent = self.percent_usage, reaper_status_logs = self.reaper_status_logs, pre_term = self.pre_term, on_calculation = self.on_calculation)
+ Reaper.new(ram * percent_usage, nil, reaper_status_logs, pre_term, on_calculation)
end
def start(frequency = self.frequency, reaper = self.reaper)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2017-05-12 17:28:39.000000000 +0200
+++ new/metadata 2019-06-26 21:06:55.000000000 +0200
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: puma_worker_killer
version: !ruby/object:Gem::Version
- version: 0.1.0
+ version: 0.1.1
platform: ruby
authors:
- Richard Schneeman
autorequire:
bindir: bin
cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: puma
@@ -19,7 +19,7 @@
version: '2.7'
- - "<"
- !ruby/object:Gem::Version
- version: '4'
+ version: '5'
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@
version: '2.7'
- - "<"
- !ruby/object:Gem::Version
- version: '4'
+ version: '5'
- !ruby/object:Gem::Dependency
name: get_process_mem
requirement: !ruby/object:Gem::Requirement
@@ -124,6 +124,7 @@
- test/fixtures/config/puma_worker_killer_start.rb
- test/fixtures/default.ru
- test/fixtures/fixture_helper.rb
+- test/fixtures/on_calculation.ru
- test/fixtures/pre_term.ru
- test/fixtures/rolling_restart.ru
- test/puma_worker_killer_test.rb
@@ -147,8 +148,7 @@
- !ruby/object:Gem::Version
version: '0'
requirements: []
-rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
signing_key:
specification_version: 4
summary: If you have a memory leak in your web code puma_worker_killer can keep it
@@ -158,6 +158,7 @@
- test/fixtures/config/puma_worker_killer_start.rb
- test/fixtures/default.ru
- test/fixtures/fixture_helper.rb
+- test/fixtures/on_calculation.ru
- test/fixtures/pre_term.ru
- test/fixtures/rolling_restart.ru
- test/puma_worker_killer_test.rb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/puma_worker_killer.gemspec new/puma_worker_killer.gemspec
--- old/puma_worker_killer.gemspec 2017-05-12 17:28:39.000000000 +0200
+++ new/puma_worker_killer.gemspec 2019-06-26 21:06:55.000000000 +0200
@@ -18,7 +18,7 @@
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
gem.require_paths = ["lib"]
- gem.add_dependency "puma", ">= 2.7", "< 4"
+ gem.add_dependency "puma", ">= 2.7", "< 5"
gem.add_dependency "get_process_mem", "~> 0.2"
gem.add_development_dependency "rack", "~> 1.6"
gem.add_development_dependency "wait_for_it", "~> 0.1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/fixtures/on_calculation.ru new/test/fixtures/on_calculation.ru
--- old/test/fixtures/on_calculation.ru 1970-01-01 01:00:00.000000000 +0100
+++ new/test/fixtures/on_calculation.ru 2019-06-26 21:06:55.000000000 +0200
@@ -0,0 +1,8 @@
+load File.expand_path("../fixture_helper.rb", __FILE__)
+
+PumaWorkerKiller.config do |config|
+ config.on_calculation = lambda { |usage| puts("Current memory footprint: #{usage} mb") }
+end
+PumaWorkerKiller.start
+
+run HelloWorldApp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/puma_worker_killer_test.rb new/test/puma_worker_killer_test.rb
--- old/test/puma_worker_killer_test.rb 2017-05-12 17:28:39.000000000 +0200
+++ new/test/puma_worker_killer_test.rb 2019-06-26 21:06:55.000000000 +0200
@@ -45,6 +45,18 @@
end
end
+ def test_on_calculation
+ file = fixture_path.join("on_calculation.ru")
+ port = 0
+ command = "bundle exec puma #{ file } -t 1:1 -w 2 --preload --debug -p #{ port }"
+ options = { wait_for: "booted", timeout: 5, env: { "PUMA_FREQUENCY" => 1, 'PUMA_RAM' => 1} }
+
+ WaitForIt.new(command, options) do |spawn|
+ assert_contains(spawn, "Out of memory")
+ assert_contains(spawn, "Current memory footprint:") # defined in on_calculate.ru
+ end
+ end
+
def assert_contains(spawn, string)
assert spawn.wait(string), "Expected logs to contain '#{string}' but it did not, contents: #{ spawn.log.read }"
end
