forked from mirror/logrus
entry: add basic coloring if tty is a terminal
This commit is contained in:
parent
0b5ff9bcef
commit
b7027167d5
27
entry.go
27
entry.go
|
@ -7,8 +7,10 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/burke/ttyutils"
|
||||||
"github.com/tobi/airbrake-go"
|
"github.com/tobi/airbrake-go"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -33,16 +35,27 @@ func (entry *Entry) Reader() (*bytes.Buffer, error) {
|
||||||
|
|
||||||
if Environment == "production" {
|
if Environment == "production" {
|
||||||
serialized, err = json.Marshal(entry.Data)
|
serialized, err = json.Marshal(entry.Data)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
|
||||||
|
}
|
||||||
|
serialized = append(serialized, '\n')
|
||||||
} else {
|
} else {
|
||||||
|
if ttyutils.IsTerminal(os.Stdout.Fd()) {
|
||||||
|
serialized = append(serialized, []byte(fmt.Sprintf("\x1b[34m%s: ", strings.ToUpper(entry.Data["level"].(string))))...)
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: Pretty-print more by coloring when stdout is a tty
|
// TODO: Pretty-print more by coloring when stdout is a tty
|
||||||
serialized, err = json.MarshalIndent(entry.Data, "", " ")
|
// TODO: If this is a println, it'll do a newline and then closing quote.
|
||||||
}
|
for k, v := range entry.Data {
|
||||||
|
serialized = append(serialized, []byte(fmt.Sprintf("%s='%s' ", k, v))...)
|
||||||
|
}
|
||||||
|
|
||||||
if err != nil {
|
if ttyutils.IsTerminal(os.Stdout.Fd()) {
|
||||||
return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
|
serialized = append(serialized, []byte("\x1b[0m")...)
|
||||||
}
|
}
|
||||||
|
|
||||||
serialized = append(serialized, '\n')
|
serialized = append(serialized, '\n')
|
||||||
|
}
|
||||||
|
|
||||||
return bytes.NewBuffer(serialized), nil
|
return bytes.NewBuffer(serialized), nil
|
||||||
}
|
}
|
||||||
|
@ -129,7 +142,7 @@ func (entry *Entry) Fatal(args ...interface{}) {
|
||||||
|
|
||||||
func (entry *Entry) Panic(args ...interface{}) {
|
func (entry *Entry) Panic(args ...interface{}) {
|
||||||
if Level >= LevelPanic {
|
if Level >= LevelPanic {
|
||||||
msg = entry.log("panic", fmt.Sprint(args...))
|
msg := entry.log("panic", fmt.Sprint(args...))
|
||||||
panic(msg)
|
panic(msg)
|
||||||
}
|
}
|
||||||
panic(fmt.Sprint(args...))
|
panic(fmt.Sprint(args...))
|
||||||
|
|
Loading…
Reference in New Issue