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

[Security] Bump puma from 4.3.3 to 4.3.5 #1655

Merged
merged 2 commits into from May 26, 2020
Merged

[Security] Bump puma from 4.3.3 to 4.3.5 #1655

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
69a4546
Bump puma from 4.3.3 to 4.3.5
dependabot-preview[bot] May 20, 2020
5567e1d
Change RAILS_MAX_THREADS to PUMA_MAX_THREADS
murny May 25, 2020
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
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Expand Up @@ -291,7 +291,7 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.5)
puma (4.3.3)
puma (4.3.5)
nio4r (~> 2.0)
pundit (1.1.0)
activesupport (>= 3.0.0)
Expand Down
2 changes: 1 addition & 1 deletion config/database.yml
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ default: &default
host: <%= ENV['DB_HOST'] || 'localhost' %>
# For details on connection pooling, see Rails configuration guide
# https://guides.rubyonrails.org/configuring.html#database-pooling
pool: <%= ENV.fetch('RAILS_MAX_THREADS') { 5 } %>
pool: <%= ENV.fetch('PUMA_MAX_THREADS') { 5 } %>


development:
Expand Down
4 changes: 2 additions & 2 deletions config/puma.rb
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
# the maximum value specified for Puma. Default is set to 5 threads for minimum
# and maximum; this matches the default thread size of Active Record.
#
max_threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 }
min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count }
max_threads_count = ENV.fetch('PUMA_MAX_THREADS') { 5 }
min_threads_count = ENV.fetch('PUMA_MIN_THREADS') { max_threads_count }
threads min_threads_count, max_threads_count

# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
Expand Down