dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Cache converter in renderer" (#7326) 

Merge pull request 7326
This commit is contained in:
Ashwin Maroli 2018-10-20 01:59:14 +05:30 committed by jekyllbot
parent 5925c1a531
commit c7a99f276c
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
History.markdown
View File

@ -106,7 +106,6 @@
* Drop support for pygments as syntax-highlighter (#7118) * Drop support for pygments as syntax-highlighter (#7118)
* Add Cache class (#7169) * Add Cache class (#7169)
* Cache converted markdown (#7159) * Cache converted markdown (#7159)
* Cache converter in renderer (#7183)
* Ignore cache directory (#7184) * Ignore cache directory (#7184)
### Development Fixes ### Development Fixes

20
lib/jekyll/renderer.rb
View File

@ -96,17 +96,15 @@ module Jekyll
# #
# Returns String the converted content. # Returns String the converted content.
def convert(content) def convert(content)
Jekyll::Cache.new("Jekyll::Renderer").getset(content) do converters.reduce(content) do |output, converter|
converters.reduce(content) do |output, converter| begin
begin converter.convert output
converter.convert output rescue StandardError => e
rescue StandardError => e Jekyll.logger.error "Conversion error:",
Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error while "\
"#{converter.class} encountered an error while "\ "converting '#{document.relative_path}':"
"converting '#{document.relative_path}':" Jekyll.logger.error("", e.to_s)
Jekyll.logger.error("", e.to_s) raise e
raise e
end
end end
end end
end end