Merge pull request #22801 from jrafanie/there_can_be_only_one_autoloa…

…der_zeitwerk There can be only one autoloader: zeitwerk (cherry picked from commit 7a3c4a6)
ManageIQ · Jan 5, 2024 · adfada4 · adfada4
1 parent 4b3220b
commit adfada4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 73 deletions.
diff --git a/config/initializers/zeitwerk.rb b/config/initializers/zeitwerk.rb
@@ -1,13 +1,11 @@
-if Rails.application.config.autoloader == :zeitwerk && Rails.autoloaders.main
-  if ENV['DEBUG_MANAGEIQ_ZEITWERK'].present?
-    Zeitwerk::Loader.default_logger = method(:puts)
-    Rails.autoloaders.main.logger = Logger.new($stdout)
-  end
-
-  # These specific directories are for code organization, not namespacing:
-  # TODO: these should be either renamed with good names, the intermediate directory removed
-  # and/or both.
-  Rails.autoloaders.main.collapse(Rails.root.join("lib/manageiq/reporting/charting"))
-  Rails.autoloaders.main.collapse(Rails.root.join("lib/ansible/runner/credential"))
-  Rails.autoloaders.main.collapse(Rails.root.join("lib/pdf_generator"))
+if ENV['DEBUG_MANAGEIQ_ZEITWERK'].present?
+  Zeitwerk::Loader.default_logger = method(:puts)
+  Rails.autoloaders.main.logger = Logger.new($stdout)
 end
+
+# These specific directories are for code organization, not namespacing:
+# TODO: these should be either renamed with good names, the intermediate directory removed
+# and/or both.
+Rails.autoloaders.main.collapse(Rails.root.join("lib/manageiq/reporting/charting"))
+Rails.autoloaders.main.collapse(Rails.root.join("lib/ansible/runner/credential"))
+Rails.autoloaders.main.collapse(Rails.root.join("lib/pdf_generator"))
diff --git a/lib/extensions/as_dependencies_interlock.rb b/lib/extensions/as_dependencies_interlock.rb
diff --git a/spec/initializers/yaml_autoloader_spec.rb b/spec/initializers/yaml_autoloader_spec.rb