Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Vmdb::Plugins to work through code reloads in development. #15057

Merged
merged 3 commits into from
May 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,7 @@ class Application < Rails::Application
# Because this is easy to mess up, keep your initializers in order.
# register plugins even before loading settings, as plugins can bring their own settings
initializer :register_vmdb_plugins, :before => :load_vmdb_settings do
Rails.application.railties.each do |railtie|
next unless railtie.class.name.start_with?("ManageIQ::Providers::") || railtie.try(:vmdb_plugin?)
Vmdb::Plugins.instance.register_vmdb_plugin(railtie)
end
Vmdb::Plugins.instance.register_vmdb_plugins
end

initializer :load_vmdb_settings, :before => :load_config_initializers do
Expand Down
14 changes: 13 additions & 1 deletion lib/vmdb/plugins.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module Vmdb
class Plugins
include Singleton

attr_reader :vmdb_plugins
attr_reader :registered_automate_domains

def initialize
Expand All @@ -11,6 +10,19 @@ def initialize
@vmdb_plugins = []
end

def vmdb_plugins
@vmdb_plugins.empty? ? register_vmdb_plugins : @vmdb_plugins
end

def register_vmdb_plugins
Rails.application.railties.each do |railtie|
next unless railtie.class.name.start_with?("ManageIQ::Providers::") || railtie.try(:vmdb_plugin?)
register_vmdb_plugin(railtie)
end

@vmdb_plugins
end

def register_vmdb_plugin(engine)
@vmdb_plugins << engine

Expand Down