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

FIX: correctly keep stylesheet cache entries

Browse Source 
The intent from day one was to keep MAX_TO_KEEP stylesheets per target
however the DELETE statement did not perform target filtering

This meant we often deleted the wrong stylesheets from the cache
This commit is contained in:
Sam
2018-09-14 12:54:11 +10:00
parent 6a2589353b
commit 419b14e58b
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/stylesheet_cache.rb
View File

@@ -3,7 +3,8 @@ class StylesheetCache < ActiveRecord::Base
MAX_TO_KEEP = 50
def self.add(target, digest, content, source_map)
def self.add(target, digest, content, source_map, max_to_keep: nil)
max_to_keep ||= MAX_TO_KEEP
old_logger = ActiveRecord::Base.logger
return false if where(target: target, digest: digest).exists?
@@ -15,16 +16,19 @@ class StylesheetCache < ActiveRecord::Base
success = create(target: target, digest: digest, content: content, source_map: source_map)
count = StylesheetCache.count
if count > MAX_TO_KEEP
if count > max_to_keep
remove_lower = StylesheetCache
.where(target: target)
.limit(MAX_TO_KEEP)
.limit(max_to_keep)
.order('id desc')
.pluck(:id)
.last
DB.exec("DELETE FROM stylesheet_cache where id < :id", id: remove_lower)
DB.exec(<<~SQL, id: remove_lower, target: target)
DELETE FROM stylesheet_cache
WHERE id < :id AND target = :target
SQL
end
success