github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

FIX: LOAD_PLUGINS=0 in dev/prod, warn in plugin:pull_compatible_all (#15537)

Browse Source 
The `plugin:pull_compatible_all` task is intended to take incompatible plugins and downgrade them to an earlier version. Problem is, when running the rake task in development/production environments, the plugins have already been activated. If an incompatible plugin raises an error in `plugin.rb` then the rake task will be unable to start.

This commit centralises our LOAD_PLUGINS detection, adds support for LOAD_PLUGINS=0 in dev/prod, and adds a warning to `plugin:pull_compatible_all` if it's run with plugins enabled.
This commit is contained in:
David Taylor 2022-01-11 12:30:22 +00:00 committed by GitHub
parent dd3e766efd
commit b3e52f99e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/global_setting.rb
View File

@ -342,4 +342,15 @@ class GlobalSetting
end end
end end
def self.load_plugins?
if ENV["LOAD_PLUGINS"] == "1"
true
elsif ENV["LOAD_PLUGINS"] == "0"
false
elsif Rails.env.test?
false
else
true
end
end
end end

2
app/models/site_setting.rb
View File

@ -15,7 +15,7 @@ class SiteSetting < ActiveRecord::Base
load_settings(File.join(Rails.root, 'config', 'site_settings.yml')) load_settings(File.join(Rails.root, 'config', 'site_settings.yml'))
unless Rails.env.test? && ENV['LOAD_PLUGINS'] != "1" if GlobalSetting.load_plugins?
Dir[File.join(Rails.root, "plugins", "*", "config", "settings.yml")].each do |file| Dir[File.join(Rails.root, "plugins", "*", "config", "settings.yml")].each do |file|
load_settings(file, plugin: file.split("/")[-3]) load_settings(file, plugin: file.split("/")[-3])
end end

10
config/application.rb
View File

@ -30,7 +30,7 @@ require_relative '../lib/plugin_gem'
# Global config # Global config
require_relative '../app/models/global_setting' require_relative '../app/models/global_setting'
GlobalSetting.configure! GlobalSetting.configure!
unless Rails.env.test? && ENV['LOAD_PLUGINS'] != "1" if GlobalSetting.load_plugins?
require_relative '../lib/custom_setting_providers' require_relative '../lib/custom_setting_providers'
end end
GlobalSetting.load_defaults GlobalSetting.load_defaults
@ -312,11 +312,9 @@ module Discourse
config.relative_url_root = GlobalSetting.relative_url_root config.relative_url_root = GlobalSetting.relative_url_root
end end
if Rails.env == "test" if Rails.env.test? && GlobalSetting.load_plugins?
if ENV['LOAD_PLUGINS'] == "1" Discourse.activate_plugins!
Discourse.activate_plugins! elsif GlobalSetting.load_plugins?
end
else
plugin_initialization_guard do plugin_initialization_guard do
Discourse.activate_plugins! Discourse.activate_plugins!
end end

7
lib/tasks/plugin.rake
View File

@ -109,6 +109,13 @@ end
desc 'pull compatible plugin versions for all plugins' desc 'pull compatible plugin versions for all plugins'
task 'plugin:pull_compatible_all' do |t| task 'plugin:pull_compatible_all' do |t|
if GlobalSetting.load_plugins?
STDERR.puts <<~TEXT
WARNING: Plugins were activated before running `rake plugin:pull_compatible_all`
You should prefix this command with LOAD_PLUGINS=0
TEXT
end
# Loop through each directory # Loop through each directory
plugins = Dir.glob(File.expand_path('plugins/*')).select { |f| File.directory? f } plugins = Dir.glob(File.expand_path('plugins/*')).select { |f| File.directory? f }
# run plugin:pull_compatible # run plugin:pull_compatible