Skip to content

Commit

Permalink
config reset
Browse files Browse the repository at this point in the history
  • Loading branch information
terrywbrady committed Oct 25, 2024
1 parent 1ec776b commit 87df585
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
module MrtDashboard
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 6.1
config.load_defaults 5.0

# Configuration for the application, engines, and railties goes here.
#
Expand Down
5 changes: 3 additions & 2 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ default: &default
# Merritt UI encountered 500 errors when mysql connections were no longer active.
# Jan 2024 - adding this setting to see if it prevents inactive connections.
# See https://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/ConnectionPool.html
#
# Oct 2024 - reverting this setting now that retry logic clears connections
#idle_timeout: 0
# idle_timeout: 0
port: 3306
username: "{!SSM: inv/readwrite/db-user}"
password: "{!SSM: inv/readwrite/db-password}"
Expand All @@ -39,4 +40,4 @@ docker: &docker
username: user
password: password
encoding: utf8mb4
#idle_timeout: 0
# idle_timeout: 0

0 comments on commit 87df585

Please sign in to comment.