From 98fd21de2cae4ee1166e6aeb69aaa411dcb23c8d Mon Sep 17 00:00:00 2001 From: Anton Tiurin Date: Tue, 10 Mar 2015 19:04:57 +0300 Subject: [PATCH] [JSON] Use type-switch for error field --- json_formatter.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/json_formatter.go b/json_formatter.go index 0e38a61..5c4c44b 100644 --- a/json_formatter.go +++ b/json_formatter.go @@ -11,11 +11,12 @@ type JSONFormatter struct{} func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) { data := make(Fields, len(entry.Data)+3) for k, v := range entry.Data { - // Otherwise errors are ignored by `encoding/json` - // https://github.com/Sirupsen/logrus/issues/137 - if err, ok := v.(error); ok { - data[k] = err.Error() - } else { + switch v := v.(type) { + case error: + // Otherwise errors are ignored by `encoding/json` + // https://github.com/Sirupsen/logrus/issues/137 + data[k] = v.Error() + default: data[k] = v } }