mirror of
https://github.com/zrepl/zrepl.git
synced 2025-06-24 19:51:43 +02:00
logging format 'human': continue printing prefixed fields if some are missing
This commit is contained in:
parent
a0f72b585b
commit
ee5445777d
@ -91,4 +91,3 @@ func (j *PrometheusJob) JobStart(ctx context.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ type PullJob struct {
|
|||||||
Prune PrunePolicy
|
Prune PrunePolicy
|
||||||
Debug JobDebugSettings
|
Debug JobDebugSettings
|
||||||
|
|
||||||
rep *replication.Replication
|
rep *replication.Replication
|
||||||
}
|
}
|
||||||
|
|
||||||
func parsePullJob(c JobParsingContext, name string, i map[string]interface{}) (j *PullJob, err error) {
|
func parsePullJob(c JobParsingContext, name string, i map[string]interface{}) (j *PullJob, err error) {
|
||||||
|
@ -77,13 +77,12 @@ func (f *HumanFormatter) Format(e *logger.Entry) (out []byte, err error) {
|
|||||||
prefixed := make(map[string]bool, len(prefixFields)+2)
|
prefixed := make(map[string]bool, len(prefixFields)+2)
|
||||||
for _, field := range prefixFields {
|
for _, field := range prefixFields {
|
||||||
val, ok := e.Fields[field].(string)
|
val, ok := e.Fields[field].(string)
|
||||||
if ok {
|
if !ok {
|
||||||
if !f.ignored(field) {
|
continue
|
||||||
fmt.Fprintf(&line, "[%s]", val)
|
}
|
||||||
prefixed[field] = true
|
if !f.ignored(field) {
|
||||||
}
|
fmt.Fprintf(&line, "[%s]", val)
|
||||||
} else {
|
prefixed[field] = true
|
||||||
break
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,7 +105,6 @@ type Receiver interface {
|
|||||||
fsrep.Receiver
|
fsrep.Receiver
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
type FilteredError struct{ fs string }
|
type FilteredError struct{ fs string }
|
||||||
|
|
||||||
func NewFilteredError(fs string) *FilteredError {
|
func NewFilteredError(fs string) *FilteredError {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user