mirror of
https://github.com/1f349/dendrite.git
synced 2024-12-23 08:44:11 +00:00
common/log: Always output timestamps as UTC
This commit is contained in:
parent
f65e26bc2a
commit
be47984c43
@ -8,13 +8,24 @@ import (
|
||||
"github.com/matrix-org/dugong"
|
||||
)
|
||||
|
||||
type utcFormatter struct {
|
||||
logrus.Formatter
|
||||
}
|
||||
|
||||
func (f utcFormatter) Format(entry *logrus.Entry) ([]byte, error) {
|
||||
entry.Time = entry.Time.UTC()
|
||||
return f.Formatter.Format(entry)
|
||||
}
|
||||
|
||||
// SetupLogging configures the logging format and destination(s).
|
||||
func SetupLogging(logDir string) {
|
||||
formatter := &logrus.TextFormatter{
|
||||
TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00",
|
||||
DisableColors: true,
|
||||
DisableTimestamp: false,
|
||||
DisableSorting: false,
|
||||
formatter := &utcFormatter{
|
||||
&logrus.TextFormatter{
|
||||
TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00",
|
||||
DisableColors: true,
|
||||
DisableTimestamp: false,
|
||||
DisableSorting: false,
|
||||
},
|
||||
}
|
||||
if logDir != "" {
|
||||
_ = os.Mkdir(logDir, os.ModePerm)
|
||||
|
Loading…
Reference in New Issue
Block a user