summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-06-24 23:15:16 -0700
committerelijah <elijah@riseup.net>2016-06-24 23:15:16 -0700
commitb87938e9c61399a9f9290b528f08226ecabe177c (patch)
tree09c93b5884ec28645595972f655d96f486548dc0
parentf55bf5b3ce8a1c899a6e74621c28d214ee67db35 (diff)
fix capistrano logging, closes #8215
-rw-r--r--lib/leap_cli/log.rb6
-rw-r--r--lib/leap_cli/logger.rb2
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]