IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Add a plugin incompatibility message (#8151)

Browse Source 
* DEV: Add a plugin incompatibility message

* Extract the plugin_initialization_guard
This commit is contained in:
Jarek Radosz
2019-10-06 20:47:33 +02:00
committed by GitHub
parent be85bc9dac
commit 87be6fe98c
2 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/application.rb
View File

@@ -21,6 +21,7 @@ require 'action_mailer/railtie'
require 'sprockets/railtie'
# Plugin related stuff
require_relative '../lib/plugin_initialization_guard'
require_relative '../lib/discourse_event'
require_relative '../lib/discourse_plugin'
require_relative '../lib/discourse_plugin_registry'
@@ -266,7 +267,9 @@ module Discourse
Discourse.activate_plugins!
end
else
Discourse.activate_plugins!
plugin_initialization_guard do
Discourse.activate_plugins!
end
end
Discourse.find_plugin_js_assets(include_disabled: true).each do |file|
@@ -301,7 +304,9 @@ module Discourse
OpenID::Util.logger = Rails.logger
# Load plugins
Discourse.plugins.each(&:notify_after_initialize)
plugin_initialization_guard do
Discourse.plugins.each(&:notify_after_initialize)
end
# we got to clear the pool in case plugins connect
ActiveRecord::Base.connection_handler.clear_active_connections!