lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 17:10:55 +00:00
Code Issues Releases Activity

Change option name from noColor to color

Browse Source 
Still same default behavior (with color)
This commit is contained in:
Pelle Johnsen 2016-01-28 07:50:07 +01:00
parent 7f888e3d18
commit a043432398
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
logs/console.go
View File

@ -47,9 +47,9 @@ var colors = []brush{
// consoleWriter implements LoggerInterface and writes messages to terminal. // consoleWriter implements LoggerInterface and writes messages to terminal.
type consoleWriter struct { type consoleWriter struct {
lg *log.Logger lg *log.Logger
Level int `json:"level"` Level int `json:"level"`
NoColor bool `json:"noColor"` Color bool `json:"color"`
} }
// NewConsole create ConsoleWriter returning as LoggerInterface. // NewConsole create ConsoleWriter returning as LoggerInterface.
@ -57,6 +57,7 @@ func NewConsole() Logger {
cw := &consoleWriter{ cw := &consoleWriter{
lg: log.New(os.Stdout, "", 0), lg: log.New(os.Stdout, "", 0),
Level: LevelDebug, Level: LevelDebug,
Color: true,
} }
return cw return cw
} }
@ -76,7 +77,7 @@ func (c *consoleWriter) WriteMsg(when time.Time, msg string, level int) error {
return nil return nil
} }
msg = formatLogTime(when) + msg msg = formatLogTime(when) + msg
if runtime.GOOS == "windows" || c.NoColor { if runtime.GOOS == "windows" || !c.Color {
c.lg.Println(msg) c.lg.Println(msg)
return nil return nil
} }

2
logs/console_test.go
View File

@ -46,6 +46,6 @@ func TestConsole(t *testing.T) {
// Test console without color // Test console without color
func TestConsoleNoColor(t *testing.T) { func TestConsoleNoColor(t *testing.T) {
log := NewLogger(100) log := NewLogger(100)
log.SetLogger("console", `{"noColor":true}`) log.SetLogger("console", `{"color":false}`)
testConsoleCalls(log) testConsoleCalls(log)
} }