Merge 4b70971495d7de9d78224362d8216407abd4cc54 into bb7b29923a72ce5c56fe00f56ccd9b469313e260

This commit is contained in:
mritd 2024-01-22 08:28:38 +00:00 committed by GitHub
commit 99e86abe18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -45,7 +45,7 @@ func New(options Options) (Factory, error) {
logFormatter := Formatter{ logFormatter := Formatter{
BaseTime: options.BaseTime, BaseTime: options.BaseTime,
DisableColors: logOptions.DisableColor || logFilePath != "", DisableColors: logOptions.DisableColor || logFilePath != "",
DisableTimestamp: !logOptions.Timestamp && logFilePath != "", DisableTimestamp: !logOptions.Timestamp,
FullTimestamp: logOptions.Timestamp, FullTimestamp: logOptions.Timestamp,
TimestampFormat: "-0700 2006-01-02 15:04:05", TimestampFormat: "-0700 2006-01-02 15:04:05",
} }