From 52eb1c0f572cecd390ae58fff178b6df0e75ae09 Mon Sep 17 00:00:00 2001
From: Simon Eskildsen <sirup@sirupsen.com>
Date: Fri, 14 Mar 2014 13:15:01 -0400
Subject: [PATCH] text_formatter: use %v instead

---
 text_formatter.go | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/text_formatter.go b/text_formatter.go
index b4936cf..3d2205a 100644
--- a/text_formatter.go
+++ b/text_formatter.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"sort"
-	"strconv"
 	"strings"
 
 	"github.com/burke/ttyutils"
@@ -62,8 +61,7 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
 
 		for key, value := range entry.Data {
 			if key != "time" && key != "level" && key != "msg" {
-				serialized = append(serialized, []byte(fmt.Sprintf("%s=%s ",
-					f.ToString(key, false), f.ToString(value, true)))...)
+				serialized = f.AppendKeyValue(serialized, key, value)
 			}
 		}
 	}
@@ -71,24 +69,23 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
 	return append(serialized, '\n'), nil
 }
 
-func (f *TextFormatter) AppendKeyValue(serialized []byte, key, value string) []byte {
-	return append(serialized, []byte(fmt.Sprintf("%s=%s ",
-		f.ToString(key, false), f.ToString(value, true)))...)
+func (f *TextFormatter) AppendKeyValue(serialized []byte, key, value interface{}) []byte {
+	return append(serialized, []byte(fmt.Sprintf("%v=%v ", key, value))...)
 }
 
-func (f *TextFormatter) ToString(value interface{}, escapeStrings bool) string {
-	switch value.(type) {
-	default:
-		if escapeStrings {
-			return fmt.Sprintf("'%s'", value)
-		} else {
-			return fmt.Sprintf("%s", value)
-		}
-	case int:
-		return fmt.Sprintf("%s", strconv.Itoa(value.(int)))
-	case uint64:
-		return fmt.Sprintf("%s", strconv.FormatUint(value.(uint64), 10))
-	case bool:
-		return fmt.Sprintf("%s", strconv.FormatBool(value.(bool)))
-	}
-}
+// func (f *TextFormatter) ToString(value interface{}, escapeStrings bool) string {
+// 	switch value.(type) {
+// 	default:
+// 		if escapeStrings {
+// 			return fmt.Sprintf("'%s'", value)
+// 		} else {
+// 			return fmt.Sprintf("%s", value)
+// 		}
+// 	case int:
+// 		return fmt.Sprintf("%s", strconv.Itoa(value.(int)))
+// 	case uint64:
+// 		return fmt.Sprintf("%s", strconv.FormatUint(value.(uint64), 10))
+// 	case bool:
+// 		return fmt.Sprintf("%s", strconv.FormatBool(value.(bool)))
+// 	}
+// }