diff options
| author | Wim <wim@42.be> | 2021-06-16 21:00:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-16 21:00:49 +0200 |
| commit | fb5a84212c491332504fcdd4b5f4a4b97705d2e3 (patch) | |
| tree | be03e973d30d040a49a90c47f1e6b73ed8922539 /vendor/go.uber.org/zap/zapcore/field.go | |
| parent | dedc1c45a113d8db373d9e4638f54a0f9d29624f (diff) | |
| download | matterbridge-msglm-fb5a84212c491332504fcdd4b5f4a4b97705d2e3.tar.gz matterbridge-msglm-fb5a84212c491332504fcdd4b5f4a4b97705d2e3.tar.bz2 matterbridge-msglm-fb5a84212c491332504fcdd4b5f4a4b97705d2e3.zip | |
Update dependencies (#1521)
Diffstat (limited to 'vendor/go.uber.org/zap/zapcore/field.go')
| -rw-r--r-- | vendor/go.uber.org/zap/zapcore/field.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vendor/go.uber.org/zap/zapcore/field.go b/vendor/go.uber.org/zap/zapcore/field.go index 7e255d63..95bdb0a1 100644 --- a/vendor/go.uber.org/zap/zapcore/field.go +++ b/vendor/go.uber.org/zap/zapcore/field.go @@ -92,6 +92,10 @@ const ( ErrorType // SkipType indicates that the field is a no-op. SkipType + + // InlineMarshalerType indicates that the field carries an ObjectMarshaler + // that should be inlined. + InlineMarshalerType ) // A Field is a marshaling operation used to add a key-value pair to a logger's @@ -115,6 +119,8 @@ func (f Field) AddTo(enc ObjectEncoder) { err = enc.AddArray(f.Key, f.Interface.(ArrayMarshaler)) case ObjectMarshalerType: err = enc.AddObject(f.Key, f.Interface.(ObjectMarshaler)) + case InlineMarshalerType: + err = f.Interface.(ObjectMarshaler).MarshalLogObject(enc) case BinaryType: enc.AddBinary(f.Key, f.Interface.([]byte)) case BoolType: @@ -167,7 +173,7 @@ func (f Field) AddTo(enc ObjectEncoder) { case StringerType: err = encodeStringer(f.Key, f.Interface, enc) case ErrorType: - encodeError(f.Key, f.Interface.(error), enc) + err = encodeError(f.Key, f.Interface.(error), enc) case SkipType: break default: |