Skip to content

Commit

Permalink
Merge pull request #313 from platanus/fix/puma-config
Browse files Browse the repository at this point in the history
fix(config/puma): replace rails .day method
  • Loading branch information
jgmontoya authored Aug 6, 2020
2 parents b577342 + c5d6e2c commit 99b1ede
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ Features:
Fix:
- Fix shrine issues related to configuration and uploader validation [#302](https://github.com/platanus/potassium/pull/302)
- Fix database recipe not running recommended generator for strong_migrations gem [#310](https://github.com/platanus/potassium/pull/310)
- Fix puma config that was causing it to crash on server start while on development [#313](https://github.com/platanus/potassium/pull/313)

## 6.0.0

2 changes: 1 addition & 1 deletion lib/potassium/assets/config/puma.rb
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
environment rack_env

# Set 1 day timeout for workers while developing
worker_timeout 1.day.seconds.to_i if rack_env == "development"
worker_timeout 24 * 60 * 60 if rack_env == "development"

on_worker_boot do
# Worker specific setup for Rails 4.1+

0 comments on commit 99b1ede

Please sign in to comment.