From ccc45b26e907a3f3f10a3617d046798fd1715cc8 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Thu, 18 Jan 2018 12:32:34 -0500 Subject: [PATCH] Merge pull request #16837 from NickLaMuro/leak_fix_to_s_autoload_paths Fix memory leak with ruby/require/autoload_paths (cherry picked from commit 193d0315ac971c43214cbc4795017959e1031ad4) https://bugzilla.redhat.com/show_bug.cgi?id=1536672 --- config/application.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config/application.rb b/config/application.rb index c10fb0bae18..6d508303ddf 100644 --- a/config/application.rb +++ b/config/application.rb @@ -72,15 +72,15 @@ class Application < Rails::Application # Customize any additional options below... config.autoload_paths += config.eager_load_paths - config.autoload_paths << Rails.root.join("app", "models", "aliases") - config.autoload_paths << Rails.root.join("app", "models", "mixins") - config.autoload_paths << Rails.root.join("lib", "miq_automation_engine", "models") - config.autoload_paths << Rails.root.join("lib", "miq_automation_engine", "models", "mixins") - config.autoload_paths << Rails.root.join("app", "controllers", "mixins") - config.autoload_paths << Rails.root.join("lib") - config.autoload_paths << Rails.root.join("lib", "services") - - config.autoload_once_paths << Rails.root.join("lib", "vmdb", "console_methods.rb") + config.autoload_paths << Rails.root.join("app", "models", "aliases").to_s + config.autoload_paths << Rails.root.join("app", "models", "mixins").to_s + config.autoload_paths << Rails.root.join("lib", "miq_automation_engine", "models").to_s + config.autoload_paths << Rails.root.join("lib", "miq_automation_engine", "models", "mixins").to_s + config.autoload_paths << Rails.root.join("app", "controllers", "mixins").to_s + config.autoload_paths << Rails.root.join("lib").to_s + config.autoload_paths << Rails.root.join("lib", "services").to_s + + config.autoload_once_paths << Rails.root.join("lib", "vmdb", "console_methods.rb").to_s # config.eager_load_paths accepts an array of paths from which Rails will eager load on boot if cache classes is enabled. # Defaults to every folder in the app directory of the application.