Merge pull request #4951 from pathawks/rubocop/stevenson

Merge pull request 4951
This commit is contained in:
jekyllbot 2016-05-26 08:24:20 -07:00
commit f271b8b4b5
2 changed files with 6 additions and 6 deletions

View File

@ -29,7 +29,6 @@ AllCops:
- lib/jekyll/renderer.rb - lib/jekyll/renderer.rb
- lib/jekyll/site.rb - lib/jekyll/site.rb
- lib/jekyll/static_file.rb - lib/jekyll/static_file.rb
- lib/jekyll/stevenson.rb
- lib/jekyll/tags/highlight.rb - lib/jekyll/tags/highlight.rb
- lib/jekyll/tags/include.rb - lib/jekyll/tags/include.rb
- lib/jekyll/tags/link.rb - lib/jekyll/tags/link.rb

View File

@ -6,13 +6,13 @@ module Jekyll
@default_formatter = Formatter.new @default_formatter = Formatter.new
@logdev = $stdout @logdev = $stdout
@formatter = proc do |_, _, _, msg| @formatter = proc do |_, _, _, msg|
"#{msg}" msg.to_s
end end
end end
def add(severity, message = nil, progname = nil, &block) def add(severity, message = nil, progname = nil)
severity ||= UNKNOWN severity ||= UNKNOWN
@logdev = set_logdevice(severity) @logdev = logdevice(severity)
if @logdev.nil? || severity < @level if @logdev.nil? || severity < @level
return true return true
@ -27,7 +27,8 @@ module Jekyll
end end
end end
@logdev.puts( @logdev.puts(
format_message(format_severity(severity), Time.now, progname, message)) format_message(format_severity(severity), Time.now, progname, message)
)
true true
end end
@ -47,7 +48,7 @@ module Jekyll
private private
def set_logdevice(severity) def logdevice(severity)
if severity > INFO if severity > INFO
$stderr $stderr
else else