diff --git a/config/application.rb b/config/application.rb index 624b38d50..c9ca958a9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -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. # diff --git a/config/database.yml b/config/database.yml index af76632f8..b16d88974 100644 --- a/config/database.yml +++ b/config/database.yml @@ -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}" @@ -39,4 +40,4 @@ docker: &docker username: user password: password encoding: utf8mb4 - #idle_timeout: 0 + # idle_timeout: 0