mirror of
https://github.com/cwinfo/matterbridge.git
synced 2025-07-07 01:54:03 +00:00
Update vendor (#852)
This commit is contained in:
13
vendor/go.uber.org/zap/zapcore/field.go
generated
vendored
13
vendor/go.uber.org/zap/zapcore/field.go
generated
vendored
@ -160,7 +160,7 @@ func (f Field) AddTo(enc ObjectEncoder) {
|
||||
case NamespaceType:
|
||||
enc.OpenNamespace(f.Key)
|
||||
case StringerType:
|
||||
enc.AddString(f.Key, f.Interface.(fmt.Stringer).String())
|
||||
err = encodeStringer(f.Key, f.Interface, enc)
|
||||
case ErrorType:
|
||||
encodeError(f.Key, f.Interface.(error), enc)
|
||||
case SkipType:
|
||||
@ -199,3 +199,14 @@ func addFields(enc ObjectEncoder, fields []Field) {
|
||||
fields[i].AddTo(enc)
|
||||
}
|
||||
}
|
||||
|
||||
func encodeStringer(key string, stringer interface{}, enc ObjectEncoder) (err error) {
|
||||
defer func() {
|
||||
if v := recover(); v != nil {
|
||||
err = fmt.Errorf("PANIC=%v", v)
|
||||
}
|
||||
}()
|
||||
|
||||
enc.AddString(key, stringer.(fmt.Stringer).String())
|
||||
return
|
||||
}
|
||||
|
3
vendor/go.uber.org/zap/zapcore/json_encoder.go
generated
vendored
3
vendor/go.uber.org/zap/zapcore/json_encoder.go
generated
vendored
@ -137,6 +137,9 @@ func (enc *jsonEncoder) resetReflectBuf() {
|
||||
if enc.reflectBuf == nil {
|
||||
enc.reflectBuf = bufferpool.Get()
|
||||
enc.reflectEnc = json.NewEncoder(enc.reflectBuf)
|
||||
|
||||
// For consistency with our custom JSON encoder.
|
||||
enc.reflectEnc.SetEscapeHTML(false)
|
||||
} else {
|
||||
enc.reflectBuf.Reset()
|
||||
}
|
||||
|
2
vendor/go.uber.org/zap/zapcore/memory_encoder.go
generated
vendored
2
vendor/go.uber.org/zap/zapcore/memory_encoder.go
generated
vendored
@ -158,7 +158,7 @@ func (s *sliceArrayEncoder) AppendReflected(v interface{}) error {
|
||||
}
|
||||
|
||||
func (s *sliceArrayEncoder) AppendBool(v bool) { s.elems = append(s.elems, v) }
|
||||
func (s *sliceArrayEncoder) AppendByteString(v []byte) { s.elems = append(s.elems, v) }
|
||||
func (s *sliceArrayEncoder) AppendByteString(v []byte) { s.elems = append(s.elems, string(v)) }
|
||||
func (s *sliceArrayEncoder) AppendComplex128(v complex128) { s.elems = append(s.elems, v) }
|
||||
func (s *sliceArrayEncoder) AppendComplex64(v complex64) { s.elems = append(s.elems, v) }
|
||||
func (s *sliceArrayEncoder) AppendDuration(v time.Duration) { s.elems = append(s.elems, v) }
|
||||
|
Reference in New Issue
Block a user