Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions fluentd.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Gem::Specification.new do |gem|
gem.add_development_dependency("test-unit-rr", ["~> 1.0"])
gem.add_development_dependency("oj", [">= 2.14", "< 4"])
gem.add_development_dependency("async-http", "~> 0.86")
gem.add_development_dependency("console", "~> 1.30")
gem.add_development_dependency("aws-sigv4", ["~> 1.8"])
gem.add_development_dependency("aws-sdk-core", ["~> 3.191"])
gem.add_development_dependency("rexml", ["~> 3.2"])
Expand Down
10 changes: 4 additions & 6 deletions lib/fluent/log/console_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ class Log
# Async gem which is used by http_server helper switched logger mechanism to
# Console gem which isn't complatible with Ruby's standard Logger (since
# v1.17). This class adapts it to Fluentd's logger mechanism.
class ConsoleAdapter < Gem::Version.new(Console::VERSION) >= Gem::Version.new("1.25") ?
Console::Output::Terminal : Console::Terminal::Logger

class ConsoleAdapter < Console::Output::Terminal
def self.wrap(logger)
_, level = Console::Logger::LEVELS.find { |key, value|
if logger.level <= 0
Expand Down Expand Up @@ -58,10 +56,10 @@ def call(subject = nil, *arguments, name: nil, severity: 'info', **options, &blo
level = 'warn'
end

@io.seek(0)
@io.truncate(0)
@stream.seek(0)
@stream.truncate(0)
super
@logger.send(level, @io.string.chomp)
@logger.send(level, @stream.string.chomp)
end
end
end
Expand Down
Loading