summaryrefslogtreecommitdiff
path: root/lib/mixlib/log/formatter.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/mixlib/log/formatter.rb')
-rw-r--r--lib/mixlib/log/formatter.rb14
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/mixlib/log/formatter.rb b/lib/mixlib/log/formatter.rb
index c8f1efa..1727452 100644
--- a/lib/mixlib/log/formatter.rb
+++ b/lib/mixlib/log/formatter.rb
@@ -42,15 +42,25 @@ module Mixlib
# put through "object.inspect"
def msg2str(msg)
case msg
+ when ::Hash
+ if msg.has_key?(:err)
+ format_exception(msg[:err])
+ else
+ msg[:msg]
+ end
when ::String
msg
when ::Exception
- "#{msg.message} (#{msg.class})\n" <<
- (msg.backtrace || []).join("\n")
+ format_exception(msg)
else
msg.inspect
end
end
+
+ def format_exception(msg)
+ "#{msg.message} (#{msg.class})\n" <<
+ (msg.backtrace || []).join("\n")
+ end
end
end
end