From b87938e9c61399a9f9290b528f08226ecabe177c Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 24 Jun 2016 23:15:16 -0700 Subject: fix capistrano logging, closes #8215 --- lib/leap_cli/log.rb | 6 +++--- lib/leap_cli/logger.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/leap_cli/log.rb b/lib/leap_cli/log.rb index b46a7eb..3bd4f45 100644 --- a/lib/leap_cli/log.rb +++ b/lib/leap_cli/log.rb @@ -10,8 +10,8 @@ module LeapCli logger.log(*args, &block) end - def log_raw(*args) - logger.log(*args) + def log_raw(*args, &block) + logger.log_raw(*args, &block) end # global shared logger @@ -152,7 +152,7 @@ module LeapCli else indent_str += ' = ' end - indent_str += prefix + indent_str += prefix if prefix messages.each do |message| message = message.strip next if message.empty? diff --git a/lib/leap_cli/logger.rb b/lib/leap_cli/logger.rb index 9e98321..058322c 100644 --- a/lib/leap_cli/logger.rb +++ b/lib/leap_cli/logger.rb @@ -219,7 +219,7 @@ module LeapCli if color == :hide return nil - elsif mode == :log || (color == :none && style.nil?) || !LeapCli.log_in_color + elsif mode == :log || (color == :none && style.nil?) || !LeapCli.logger.log_in_color return [message, line_prefix, options] else term_color = COLORS[color] -- cgit v1.2.3