A platform for community discussion. Free, open, simple.
FIX: Refresh site settings after process forks (#41856)
Alan Guo Xiang Tanb81b9b8e2706
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rbindex 5aad8c07cef..e05ea175279 100644--- a/lib/site_setting_extension.rb+++ b/lib/site_setting_extension.rb@@ -594,7 +594,7 @@ module SiteSettingExtension# Merges the provider values of site settings (whether it be from the DB or wherever)# and theme site settings with the default values of those settings, also taking into# account shadowed site settings and upcoming change behaviour.- def refresh!(refresh_site_settings: true, refresh_theme_site_settings: true)+ def refresh!(refresh_site_settings: true, refresh_theme_site_settings: true, clear_caches: true)mutex.synchronize doensure_listen_for_changes@@ -669,10 +669,12 @@ module SiteSettingExtensionrefresh_theme_site_settings! if refresh_theme_site_settings- clear_cache!(- expire_theme_site_setting_cache:- ThemeSiteSetting.can_access_db? && refresh_theme_site_settings,- )+ if clear_caches+ clear_cache!(+ expire_theme_site_setting_cache:+ ThemeSiteSetting.can_access_db? && refresh_theme_site_settings,+ )+ endendend@@ -736,6 +738,7 @@ module SiteSettingExtensiondef after_fork@process_id = nilensure_listen_for_changes+ RailsMultisite::ConnectionManagement.safe_each_connection { refresh!(clear_caches: false) }enddef raise_invalid_setting_access(setting_name)diff --git a/spec/lib/site_setting_extension_multisite_spec.rb b/spec/lib/site_setting_extension_multisite_spec.rbindex 676d5b481c5..8fb62097c0d 100644--- a/spec/lib/site_setting_extension_multisite_spec.rb+++ b/spec/lib/site_setting_extension_multisite_spec.rb@@ -15,4 +15,36 @@ RSpec.describe SiteSettingExtension, type: :multisite dotest_multisite_connection("second") { expect(settings.hello).to eq(1) }end++ describe ".after_fork" do+ it "loads the current settings for each configured site" do+ settings.setting(:hello, 1)++ settings.hello = 100+ test_multisite_connection("second") { settings.hello = 200 }++ settings.provider.save(:hello, 111, SiteSetting.types[:integer])+ test_multisite_connection("second") do+ settings.provider.save(:hello, 222, SiteSetting.types[:integer])+ end++ settings.after_fork++ expect(settings.hello).to eq(111)+ test_multisite_connection("second") { expect(settings.hello).to eq(222) }+ end++ it "does not publish cache invalidation messages while reloading settings" do+ settings.setting(:hello, 1)+ settings.hello = 100+ settings.provider.save(:hello, 111, SiteSetting.types[:integer])+ test_multisite_connection("second") do+ settings.provider.save(:hello, 222, SiteSetting.types[:integer])+ end++ messages = MessageBus.track_publish { settings.after_fork }++ expect(messages).to eq([])+ end+ endenddiff --git a/spec/lib/site_setting_extension_spec.rb b/spec/lib/site_setting_extension_spec.rbindex f1fbdc57854..644ca37e206 100644--- a/spec/lib/site_setting_extension_spec.rb+++ b/spec/lib/site_setting_extension_spec.rb@@ -184,6 +184,19 @@ RSpec.describe SiteSettingExtension doendend+ describe ".after_fork" do+ it "refreshes the site settings" do+ settings.setting(:hello, 1)+ settings.hello = 100++ settings.provider.save(:hello, 200, SiteSetting.types[:integer])++ settings.after_fork++ expect(settings.hello).to eq(200)+ end+ end+describe "DiscourseEvent" dobefore dosettings.setting(:test_setting, 1)