Merge pull request cihub#108 from eyasuyuki/master

add %r for windos
jonsyu1 · Mar 26, 2016 · a113d9f · a113d9f
2 parents 3549fbb + 6dc4b15
commit a113d9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/format.go b/format.go
@@ -99,6 +99,7 @@ var formatterFuncs = map[string]FormatterFunc{
 	"UTCTime":   formatterUTCTime,
 	"Ns":        formatterNs,
 	"UTCNs":     formatterUTCNs,
+	"r":         formatterr,
 	"n":         formattern,
 	"t":         formattert,
 }
@@ -422,6 +423,10 @@ func formatterUTCNs(message string, level LogLevel, context LogContextInterface)
 	return context.CallTime().UTC().UnixNano()
 }
 
+func formatterr(message string, level LogLevel, context LogContextInterface) interface{} {
+	return "\r"
+}
+
 func formattern(message string, level LogLevel, context LogContextInterface) interface{} {
 	return "\n"
 }

diff --git a/format_test.go b/format_test.go
@@ -121,6 +121,7 @@ var formatTests = []formatTest{
 	{"[%Level]%MsgX[%Level]", "test", ErrorLvl, "[Error]testX[Error]", false},
 	{"%Levell%Msgl", "Test", CriticalLvl, "CriticallTestl", false},
 	{"%Lev%Msg%LEVEL%LEV%l%Msg", "Test", InfoLvl, "InfTestINFOINFiTest", false},
+	{"%r", "", CriticalLvl, "\r", false},
 	{"%n", "", CriticalLvl, "\n", false},
 	{"%t", "", CriticalLvl, "\t", false},
 }