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

Merge pull request #1007 from michaelklishin/patch-1 

Catch all exceptions, not just StandardError descendents
This commit is contained in:
Parker Moore 2013-04-30 12:59:02 -07:00
parent 48fe514c54 82ec02905e
commit 1f02150ee9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/jekyll/convertible.rb
View File

@ -34,10 +34,10 @@ module Jekyll
self.content = $POSTMATCH self.content = $POSTMATCH
self.data = YAML.safe_load($1) self.data = YAML.safe_load($1)
end end
rescue => e
puts "Error reading file #{File.join(base, name)}: #{e.message}"
rescue SyntaxError => e rescue SyntaxError => e
puts "YAML Exception reading #{File.join(base, name)}: #{e.message}" puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"
rescue Exception => e
puts "Error reading file #{File.join(base, name)}: #{e.message}"
end end
self.data ||= {} self.data ||= {}
@ -75,7 +75,7 @@ module Jekyll
# Returns the converted content # Returns the converted content
def render_liquid(content, payload, info) def render_liquid(content, payload, info)
Liquid::Template.parse(content).render!(payload, info) Liquid::Template.parse(content).render!(payload, info)
rescue => e rescue Exception => e
Jekyll::Logger.error "Liquid Exception:", "#{e.message} in #{payload[:file]}" Jekyll::Logger.error "Liquid Exception:", "#{e.message} in #{payload[:file]}"
e.backtrace.each do |backtrace| e.backtrace.each do |backtrace|
puts backtrace puts backtrace