A platform for community discussion. Free, open, simple.
PERF: Only recompile stylesheets when required (#41735)
David Taylor4cee62dbd5a2
diff --git a/app/controllers/stylesheets_controller.rb b/app/controllers/stylesheets_controller.rbindex b147a3b8669..c79b41f23a7 100644--- a/app/controllers/stylesheets_controller.rb+++ b/app/controllers/stylesheets_controller.rb@@ -72,14 +72,7 @@ class StylesheetsController < ApplicationControllerreturn head :not_modifiedend- unless File.exist?(location)- if current = query.pick(source_map ? :source_map : :content)- FileUtils.mkdir_p(cache_path)- Discourse::Utils.atomic_write_file(location, current)- else- raise Discourse::NotFound- end- end+ raise Discourse::NotFound if !StylesheetCache.write_to_disk(query, location, source_map:)response.headers["Last-Modified"] = stylesheet_time.httpdate if stylesheet_timeimmutable_for(1.year)diff --git a/app/models/stylesheet_cache.rb b/app/models/stylesheet_cache.rbindex ed5dbba16fe..6c948eb10c4 100644--- a/app/models/stylesheet_cache.rb+++ b/app/models/stylesheet_cache.rb@@ -34,6 +34,17 @@ class StylesheetCache < ActiveRecord::BaseActiveRecord::Base.logger = old_logger if Rails.env.development? && old_loggerend+ def self.write_to_disk(relation, location, source_map: false)+ return true if File.exist?(location)++ content = relation.pick(source_map ? :source_map : :content)+ return false if content.nil?++ FileUtils.mkdir_p(File.dirname(location))+ Discourse::Utils.atomic_write_file(location, content)+ true+ end+def self.clean_upStylesheetCache.where("created_at < ?", CLEANUP_AFTER_DAYS.days.ago).delete_allenddiff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rbindex bf67c7a305f..825c5dd9d25 100644--- a/lib/stylesheet/manager.rb+++ b/lib/stylesheet/manager.rb@@ -69,9 +69,14 @@ class Stylesheet::Manager)targets.each do |target|- $stderr.puts "precompile target: #{target}"+ builder = Stylesheet::Manager::Builder.new(target: target, manager: nil)- Stylesheet::Manager::Builder.new(target: target, manager: nil).compile(force: true)+ if builder.hydrate_from_cache!+ $stderr.puts "precompile target: #{target} (cached)"+ else+ $stderr.puts "precompile target: #{target}"+ builder.compile+ endendend@@ -108,8 +113,13 @@ class Stylesheet::ManagerStylesheet::Manager::Builder.new(target: target, theme: theme, manager: manager)next if !scss_checker.has_scss(theme.id)- $stderr.puts "precompile target: #{target} #{theme.name}"- builder.compile(force: true)++ if builder.hydrate_from_cache!+ $stderr.puts "precompile target: #{target} #{theme.name} (cached)"+ else+ $stderr.puts "precompile target: #{target} #{theme.name}"+ builder.compile+ endcompiled << "#{target}_#{theme.id}"endend@@ -118,13 +128,20 @@ class Stylesheet::Managertheme_dark_color_scheme = ColorScheme.find_by_id(dark_color_scheme_id)theme = manager.get_theme(theme_id)[theme_color_scheme, theme_dark_color_scheme, *color_schemes].compact.uniq.each do |scheme|- $stderr.puts "precompile target: #{COLOR_SCHEME_STYLESHEET} #{theme.name} (#{scheme.name})"- Stylesheet::Manager::Builder.new(- target: COLOR_SCHEME_STYLESHEET,- theme: theme,- color_scheme: scheme,- manager: manager,- ).compile(force: true)+ builder =+ Stylesheet::Manager::Builder.new(+ target: COLOR_SCHEME_STYLESHEET,+ theme: theme,+ color_scheme: scheme,+ manager: manager,+ )++ if builder.hydrate_from_cache!+ $stderr.puts "precompile target: #{COLOR_SCHEME_STYLESHEET} #{theme.name} (#{scheme.name}) (cached)"+ else+ $stderr.puts "precompile target: #{COLOR_SCHEME_STYLESHEET} #{theme.name} (#{scheme.name})"+ builder.compile+ endendclear_color_scheme_cache!diff --git a/lib/stylesheet/manager/builder.rb b/lib/stylesheet/manager/builder.rbindex 112911aae6c..9b71967bc6c 100644--- a/lib/stylesheet/manager/builder.rb+++ b/lib/stylesheet/manager/builder.rb@@ -74,6 +74,15 @@ class Stylesheet::Manager::Buildercssend+ def hydrate_from_cache!+ relation = StylesheetCache.where(target: qualified_target, digest: digest)+ return false if !relation.exists?++ StylesheetCache.write_to_disk(relation, stylesheet_fullpath)+ StylesheetCache.write_to_disk(relation, source_map_fullpath, source_map: true)+ true+ end+def current_hostnameDiscourse.current_hostnameenddiff --git a/spec/lib/stylesheet/manager_spec.rb b/spec/lib/stylesheet/manager_spec.rbindex 96ed893272a..048292b738d 100644--- a/spec/lib/stylesheet/manager_spec.rb+++ b/spec/lib/stylesheet/manager_spec.rb@@ -924,6 +924,31 @@ RSpec.describe Stylesheet::Manager doexpect(StylesheetCache.pluck(:target)).to contain_exactly(*core_targets)end+ it "hydrates core CSS to disk from StylesheetCache without recompiling" do+ capture_output(:stderr) { Stylesheet::Manager.precompile_css }+ Stylesheet::Manager.rm_cache_folder+ expect(Dir["#{Stylesheet::Manager.cache_fullpath}/*.css"]).to be_empty++ Stylesheet::Compiler.expects(:compile_asset).never+ output = capture_output(:stderr) { Stylesheet::Manager.precompile_css }++ expect(output.scan(/\(cached\)/).length).to eq(core_targets.length)+ expect(Dir["#{Stylesheet::Manager.cache_fullpath}/*.css"].length).to eq(core_targets.length)+ end++ it "hydrates theme CSS to disk from StylesheetCache without recompiling" do+ capture_output(:stderr) { Stylesheet::Manager.precompile_theme_css }+ cached_count = StylesheetCache.count+ Stylesheet::Manager.rm_cache_folder+ expect(Dir["#{Stylesheet::Manager.cache_fullpath}/*.css"]).to be_empty++ Stylesheet::Compiler.expects(:compile_asset).never+ output = capture_output(:stderr) { Stylesheet::Manager.precompile_theme_css }++ expect(output).to include("(cached)")+ expect(Dir["#{Stylesheet::Manager.cache_fullpath}/*.css"].length).to eq(cached_count)+ end+it "generates precompiled CSS - only themes" dooutput = capture_output(:stderr) { Stylesheet::Manager.precompile_theme_css }