serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 22:23:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

logging: Little fix for filtering object fields

Browse source
This commit is contained in:
Matthew Holt 2020-01-01 10:26:37 -07:00
parent 3d9f8eac08
commit 8c7c2e4af2
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/logging/filterencoder.go
View file

@ -39,6 +39,11 @@ type FilterEncoder struct {
// A map of field names to their filters. Note that this // A map of field names to their filters. Note that this
// is not a module map; the keys are field names. // is not a module map; the keys are field names.
//
// Nested fields can be referenced by representing a
// layer of nesting with `>`. In other words, for an
// object like `{"a":{"b":0}}`, the inner field can
// be referenced as `a>b`.
FieldsRaw map[string]json.RawMessage `json:"fields,omitempty" caddy:"namespace=caddy.logging.encoders.filter inline_key=filter"` FieldsRaw map[string]json.RawMessage `json:"fields,omitempty" caddy:"namespace=caddy.logging.encoders.filter inline_key=filter"`
wrapped zapcore.Encoder wrapped zapcore.Encoder
@ -96,6 +101,9 @@ func (fe FilterEncoder) AddArray(key string, marshaler zapcore.ArrayMarshaler) e
// AddObject is part of the zapcore.ObjectEncoder interface. // AddObject is part of the zapcore.ObjectEncoder interface.
func (fe FilterEncoder) AddObject(key string, marshaler zapcore.ObjectMarshaler) error { func (fe FilterEncoder) AddObject(key string, marshaler zapcore.ObjectMarshaler) error {
if fe.filtered(key, marshaler) {
return nil
}
fe.keyPrefix += key + ">" fe.keyPrefix += key + ">"
return fe.wrapped.AddObject(key, logObjectMarshalerWrapper{ return fe.wrapped.AddObject(key, logObjectMarshalerWrapper{
enc: fe, enc: fe,