Skip to content

Commit

Permalink
Merge pull request #320 from openstax/puma_5_2
Browse files Browse the repository at this point in the history
Ruby 2.7 and Puma 5.2 config options
  • Loading branch information
Dantemss authored Mar 26, 2021
2 parents bf7a8aa + 61ae5ce commit 7effe11
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 2.7
- uses: actions/cache@v2
with:
path: vendor/bundle
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
# Install ruby
- uses: actions/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 2.7

# Retrieve gem cache for merge commit parent
- uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 2.7
- uses: actions/cache@v2
with:
path: vendor/bundle
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.1
2.7.2
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ gem 'bootstrap-sass'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'


# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'

Expand Down
7 changes: 7 additions & 0 deletions config/puma.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,10 @@

# Allow puma to be restarted by `rails restart` command.
plugin :tmp_restart

# Call GC.start and GC.compact before forking to try to reduce worker memory usage
nakayoshi_fork

# Adds a small delay before accepting requests if the worker (process) has threads already
# processing other requests, to try to get idle workers to accept the request
wait_for_less_busy_worker ENV.fetch('WAIT_FOR_LESS_BUSY_WORKERS', '0.005').to_f

0 comments on commit 7effe11

Please sign in to comment.