codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add better error handling, correct the location on disk of stylesheet

Browse source
This commit is contained in:
Sam 2015-05-05 23:28:19 +10:00
parent eb244bac34
commit ea670118c1
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/stylesheets_controller.rb
View file

@ -8,7 +8,7 @@ class StylesheetsController < ApplicationController
digest = "_" + digest if digest
# Security note, safe due to route constraint
location = "#{DiscourseStylesheets::CACHE_PATH}/#{target}#{digest}.css"
location = "#{Rails.root}/#{DiscourseStylesheets::CACHE_PATH}/#{target}#{digest}.css"
unless File.exist?(location)
query = StylesheetCache.where(target: target)

2
app/models/stylesheet_cache.rb
View file

@ -20,6 +20,8 @@ class StylesheetCache < ActiveRecord::Base
success
rescue ActiveRecord::RecordNotUnique
false
rescue PG::UniqueViolation
false
end
end

6
lib/sass/discourse_stylesheets.rb
View file

@ -89,7 +89,11 @@ class DiscourseStylesheets
File.open(stylesheet_fullpath, "w") do |f|
f.puts css
end
StylesheetCache.add(@target, digest, css)
begin
StylesheetCache.add(@target, digest, css)
rescue => e
Rails.logger.warn "Completely unexpected error adding item to cache #{e}"
end
css
end