Skip to content

Commit

Permalink
log/console_adapter: support console gem v1.25
Browse files Browse the repository at this point in the history
`Console::Terminal::Logger` class path has changed in `console`
gem v1.25:

socketry/console@v1.24.0...v1.25.0#diff-6e7355da8b6a8f794e74e462aebbe4b23f7752dab2a29967d17707eabb71ce12

Note: We can't stop considering the older versions because v1.25
requires Ruby v3.1 or older. 

For the v1.25, there is another issue about a warning(fluent#4488):

    Fiber#storage has borked keys and is being monkey-patched.

Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
  • Loading branch information
daipom committed May 13, 2024
1 parent 236d87d commit daa6c76
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions lib/fluent/log/console_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@
# limitations under the License.
#

require 'console/terminal/logger'
require 'console'

module Fluent
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 < Console::Terminal::Logger
class ConsoleAdapter < Gem::Version.new(Console::VERSION) >= Gem::Version.new("1.25") ?
Console::Output::Terminal : Console::Terminal::Logger

def self.wrap(logger)
_, level = Console::Logger::LEVELS.find { |key, value|
if logger.level <= 0
Expand Down

0 comments on commit daa6c76

Please sign in to comment.