Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update puma Gem to 5.6.5 #51929

Merged
merged 2 commits into from May 23, 2023
Merged

Update puma Gem to 5.6.5 #51929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
016e01a
Update `puma` Gem to 5.6.5
Hamms May 16, 2023
cff4a7c
remove custom puma logging now that we're on a mainline branch that d…
Hamms May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Expand Up @@ -126,8 +126,8 @@ gem 'open_uri_redirections', require: false
gem 'gctools', github: 'wjordan/gctools', ref: 'ruby-2.5'
# Optimizes copy-on-write memory usage with GC before web-application fork.
gem 'nakayoshi_fork'
# Ref: https://github.com/puma/puma/pull/1646
gem 'puma', github: 'wjordan/puma', branch: 'debugging'

gem 'puma', '~> 5.0'
gem 'puma_worker_killer'
gem 'raindrops'

Expand Down
17 changes: 5 additions & 12 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -105,13 +105,6 @@ GIT
multi_json (>= 1.0.3)
omniauth-oauth2 (~> 1.4)

GIT
remote: https://github.com/wjordan/puma.git
revision: 29a576120b30c34db7706c062ddf9a046723789f
branch: debugging
specs:
puma (3.12.0)

GIT
remote: https://github.com/wjordan/sprockets.git
revision: 35caa45a78b739362b7db087b141f89e27d107c7
Expand Down Expand Up @@ -651,9 +644,11 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
puma_worker_killer (0.1.0)
puma (5.6.5)
nio4r (~> 2.0)
puma_worker_killer (0.3.1)
get_process_mem (~> 0.2)
puma (>= 2.7, < 4)
puma (>= 2.7)
pusher (1.3.1)
httpclient (~> 2.7)
multi_json (~> 1.0)
Expand All @@ -674,8 +669,6 @@ GEM
rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-parser (0.7.0)
rack
rack-protection (2.2.3)
rack
rack-ssl-enforcer (0.2.9)
Expand Down Expand Up @@ -1026,7 +1019,7 @@ DEPENDENCIES
pg
phantomjs (~> 1.9.7.1)
pry (~> 0.14.0)
puma!
puma (~> 5.0)
puma_worker_killer
pusher (~> 1.3.1)
rack-cache
Expand Down
6 changes: 0 additions & 6 deletions dashboard/config/puma.rb
View file
Open in desktop
Expand Up @@ -39,9 +39,3 @@
require 'gctools/oobgc'
out_of_band {GC::OOB.run}
end

# Log thread backtraces and GC stats from all worker processes every second when enabled.
plugin :log_stats
LogStats.threshold = -> {DCDO.get('logStatsDashboard', nil)}
filter_gems = %w(puma sinatra actionview activesupport honeybadger newrelic rack)
LogStats.backtrace_filter = ->(bt) {CDO.filter_backtrace(bt, filter_gems: filter_gems)}
6 changes: 0 additions & 6 deletions pegasus/config/puma.rb
View file
Open in desktop
Expand Up @@ -38,9 +38,3 @@
require 'gctools/oobgc'
out_of_band {GC::OOB.run}
end

# Log thread backtraces and GC stats from all worker processes every second when enabled.
plugin :log_stats
LogStats.threshold = -> {DCDO.get('logStatsPegasus', nil)}
filter_gems = %w(puma sinatra actionview activesupport honeybadger newrelic rack)
LogStats.backtrace_filter = ->(bt) {CDO.filter_backtrace(bt, filter_gems: filter_gems)}