Przeglądaj źródła

Log default format

Signed-off-by: Vishal Rana <vr@labstack.com>
Vishal Rana 9 lat temu
rodzic
commit
9c0a60557b
2 zmienionych plików z 8 dodań i 8 usunięć
  1. 3 3
      log/log.go
  2. 5 5
      log/log_test.go

+ 3 - 3
log/log.go

@@ -37,7 +37,7 @@ const (
 
 var (
 	global        = New("-")
-	defaultFormat = "${time} | ${level} | ${prefix} | ${message}\n"
+	defaultFormat = "time=${time_rfc3339}, level=${level}, prefix=${prefix}, message=${message}\n"
 )
 
 func New(prefix string) (l *Logger) {
@@ -255,8 +255,8 @@ func (l *Logger) log(v uint8, format string, args ...interface{}) {
 		}
 		l.template.ExecuteFunc(l.output, func(w io.Writer, tag string) (int, error) {
 			switch tag {
-			case "time":
-				return w.Write([]byte(time.Now().Format(time.Stamp)))
+			case "time_rfc3339":
+				return w.Write([]byte(time.Now().Format(time.RFC3339)))
 			case "level":
 				return w.Write([]byte(l.levels[v]))
 			case "prefix":

+ 5 - 5
log/log_test.go

@@ -33,10 +33,10 @@ func test(l *Logger, t *testing.T) {
 	assert.NotContains(t, b.String(), "debugf")
 	assert.NotContains(t, b.String(), "info")
 	assert.NotContains(t, b.String(), "infof")
-	assert.Contains(t, b.String(), "WARN | "+l.prefix+" | warn")
-	assert.Contains(t, b.String(), "WARN | "+l.prefix+" | warnf")
-	assert.Contains(t, b.String(), "ERROR | "+l.prefix+" | error")
-	assert.Contains(t, b.String(), "ERROR | "+l.prefix+" | errorf")
+	assert.Contains(t, b.String(), "level=WARN, prefix="+l.prefix+", message=warn")
+	assert.Contains(t, b.String(), "level=WARN, prefix="+l.prefix+", message=warnf")
+	assert.Contains(t, b.String(), "level=ERROR, prefix="+l.prefix+", message=error")
+	assert.Contains(t, b.String(), "level=ERROR, prefix="+l.prefix+", message=errorf")
 }
 
 func TestLog(t *testing.T) {
@@ -95,7 +95,7 @@ func TestFormat(t *testing.T) {
 	b := new(bytes.Buffer)
 	l.SetOutput(b)
 	l.Info("test")
-	assert.Contains(t, "INFO | test", b.String())
+	assert.Equal(t, "INFO | test", b.String())
 }
 
 func BenchmarkLog(b *testing.B) {