Add error conversion (#32)

evalphobia · Jul 11, 2019 · 989dca7 · 989dca7
1 parent 7275750
commit 989dca7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/reflect.go b/reflect.go
@@ -11,6 +11,9 @@ func ConvertToValue(p interface{}, tagName string) interface{} {
 	rv := toValue(p)
 	switch rv.Kind() {
 	case reflect.Struct:
+		if err, ok := p.(error); ok {
+			return err.Error()
+		}
 		return convertFromStruct(rv.Interface(), tagName)
 	case reflect.Map:
 		return convertFromMap(rv, tagName)

diff --git a/reflect_test.go b/reflect_test.go
@@ -1,6 +1,7 @@
 package logrus_fluent
 
 import (
+	"errors"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -25,6 +26,19 @@ type Creature struct {
 	Cute   bool   `fluent:"-"`
 }
 
+func TestConvertToValuError(t *testing.T) {
+	assert := assert.New(t)
+
+	err := errors.New("the error")
+	data := map[string]interface{} {"error": err}
+
+	result := ConvertToValue(data, TagName)
+
+	r, ok := result.(map[string]interface{})
+	assert.True(ok)
+	assert.Equal(err.Error(), r["error"])
+}
+
 func TestConvertToValueStruct(t *testing.T) {
 	assert := assert.New(t)