mirror of
https://github.com/zrepl/zrepl.git
synced 2025-06-14 13:56:46 +02:00
logging: fixup 4763486: implementation would parse 'date' instead of 'time' field in config
This commit is contained in:
parent
476348689a
commit
b576253ea8
@ -139,7 +139,7 @@ func parseOutlet(i interface{}) (o logger.Outlet, level logger.Level, err error)
|
|||||||
func parseStdoutOutlet(i interface{}, formatter EntryFormatter) (WriterOutlet, error) {
|
func parseStdoutOutlet(i interface{}, formatter EntryFormatter) (WriterOutlet, error) {
|
||||||
|
|
||||||
var in struct {
|
var in struct {
|
||||||
Date bool
|
Time bool
|
||||||
}
|
}
|
||||||
if err := mapstructure.Decode(i, &in); err != nil {
|
if err := mapstructure.Decode(i, &in); err != nil {
|
||||||
return WriterOutlet{}, errors.Wrap(err, "invalid structure for stdout outlet")
|
return WriterOutlet{}, errors.Wrap(err, "invalid structure for stdout outlet")
|
||||||
@ -147,7 +147,7 @@ func parseStdoutOutlet(i interface{}, formatter EntryFormatter) (WriterOutlet, e
|
|||||||
|
|
||||||
flags := MetadataAll
|
flags := MetadataAll
|
||||||
writer := os.Stdout
|
writer := os.Stdout
|
||||||
if !isatty.IsTerminal(writer.Fd()) && !in.Date {
|
if !isatty.IsTerminal(writer.Fd()) && !in.Time {
|
||||||
flags &= ^MetadataTime
|
flags &= ^MetadataTime
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user