Skip to content

Commit

Permalink
Merge pull request #16837 from NickLaMuro/leak_fix_to_s_autoload_paths
Browse files Browse the repository at this point in the history
Fix memory leak with ruby/require/autoload_paths
(cherry picked from commit 193d031)

https://bugzilla.redhat.com/show_bug.cgi?id=1536672
  • Loading branch information
Fryguy authored and simaishi committed Jan 19, 2018
1 parent bb43558 commit ccc45b2
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions config/application.rb
Expand Up @@ -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.
Expand Down

0 comments on commit ccc45b2

Please sign in to comment.