Compare commits

...

2 Commits

Author SHA1 Message Date
ehlxr a15a40a425 upgrade dependencies 2021-01-04 17:14:30 +08:00
ehlxr 08e6fdbd53 update at 2021-01-04 15:51:39 by ehlxr 2021-01-04 15:51:39 +08:00
4 changed files with 52 additions and 12 deletions

View File

@ -55,7 +55,7 @@ func NewTextEncoder(cfg zapcore.EncoderConfig) zapcore.Encoder {
return &textEncoder{
EncoderConfig: &cfg,
buf: bufferpool.Get(),
spaced: true,
spaced: false,
}
}
@ -222,13 +222,13 @@ func (enc *textEncoder) AddDuration(key string, val time.Duration) {
func (enc *textEncoder) AddFloat64(key string, val float64) {
enc.addKey(key)
enc.appendFloat(val, 64)
enc.buf.AppendByte(']')
enc.buf.AppendByte('}')
}
func (enc *textEncoder) AddInt64(key string, val int64) {
enc.addKey(key)
enc.addElementSeparator()
enc.buf.AppendInt(val)
enc.buf.AppendByte(']')
enc.buf.AppendByte('}')
}
func (enc *textEncoder) AddReflected(key string, obj interface{}) error {
enc.resetReflectBuf()
@ -252,7 +252,7 @@ func (enc *textEncoder) AddString(key, val string) {
// enc.buf.AppendByte('"')
enc.safeAddString(val)
// enc.buf.AppendByte('"')
enc.buf.AppendByte(']')
enc.buf.AppendByte('}')
}
func (enc *textEncoder) AddTime(key string, val time.Time) {
enc.addKey(key)
@ -270,7 +270,7 @@ func (enc *textEncoder) AddUint64(key string, val uint64) {
enc.addKey(key)
enc.addElementSeparator()
enc.buf.AppendUint(val)
enc.buf.AppendByte(']')
enc.buf.AppendByte('}')
}
//noinspection GoRedundantConversion
@ -304,15 +304,38 @@ func (enc *textEncoder) clone() *textEncoder {
func (enc *textEncoder) addKey(key string) {
enc.addElementSeparator()
// enc.buf.AppendByte('"')
enc.buf.AppendByte('[')
if enc.replaceSeparator('}') {
enc.buf.AppendByte(',')
enc.buf.AppendByte(' ')
} else {
enc.buf.AppendByte('{')
}
enc.safeAddString(key)
// enc.buf.AppendByte('"')
enc.buf.AppendByte(':')
// enc.buf.AppendByte(':')
enc.buf.AppendByte('=')
if enc.spaced {
enc.buf.AppendByte(' ')
}
}
func (enc *textEncoder) replaceSeparator(v byte) bool {
last := enc.buf.Len() - 1
if last < 0 {
return false
}
if enc.buf.Bytes()[last] == v {
t := enc.buf.Bytes()[:last]
enc.buf.Reset()
_, _ = enc.buf.Write(t)
return true
}
return false
}
func (enc *textEncoder) addElementSeparator() {
last := enc.buf.Len() - 1
if last < 0 {
@ -322,7 +345,7 @@ func (enc *textEncoder) addElementSeparator() {
case '{', '[', ':', ',', ' ':
return
default:
enc.buf.AppendByte(',')
// enc.buf.AppendByte(',')
if enc.spaced {
enc.buf.AppendByte(' ')
}

8
go.mod
View File

@ -4,6 +4,10 @@ go 1.13
require (
github.com/ehlxr/lumberjack v0.0.2-0.20200107093220-2a579f1b2e4d
github.com/robfig/cron/v3 v3.0.0
go.uber.org/zap v1.12.0
github.com/robfig/cron/v3 v3.0.1
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.16.0
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee // indirect
honnef.co/go/tools v0.1.0 // indirect
)

View File

@ -1,9 +1,10 @@
package log
import (
"go.uber.org/zap"
"testing"
"time"
"go.uber.org/zap"
)
func TestLog(t *testing.T) {
@ -30,6 +31,18 @@ func TestLogWithConfig(t *testing.T) {
// Panicf("this is %s message", "panic")
}
func TestLogWithNew(t *testing.T) {
config := NewLogConfig()
_ = config.Level.Set("debug")
config.Name = "main"
logger := config.New()
log := With(logger, "traceid", float64(21221212122), "request", "[POST]/hello/v2")
log.Debugf("this is %s message", "debug")
log.Infof("this is %s message", "info")
}
func TestLogRote(t *testing.T) {
lc := NewLogConfig()
lc.MaxSize = 1

View File

@ -1 +1 @@
v0.0.9
v0.0.11