Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

log: support custom time format configuration #1401

Merged
merged 1 commit into from
Apr 3, 2023
Merged

log: support custom time format configuration #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions log/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ import (
"unicode/utf8"
)

var (
timeFormat = "2006-01-02T15:04:05-0700"
termTimeFormat = "01-02|15:04:05.000"
)

const (
timeFormat = "2006-01-02T15:04:05-0700"
termTimeFormat = "01-02|15:04:05.000"
floatFormat = 'f'
termMsgJust = 40
termCtxMaxPadding = 40
Expand Down Expand Up @@ -482,3 +485,11 @@ func escapeString(s string) string {
}
return strconv.Quote(s)
}

func SetTermTimeFormat(format string) {
termTimeFormat = format
}

func SetTimeFormat(format string) {
timeFormat = format
}
13 changes: 9 additions & 4 deletions node/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,13 @@ func (c *Config) warnOnce(w *bool, format string, args ...interface{}) {
}

type LogConfig struct {
FileRoot string
FilePath string
MaxBytesSize uint
Level string
FileRoot *string
FilePath *string
MaxBytesSize *uint
Level *string

// TermTimeFormat is the time format used for console logging.
TermTimeFormat *string
// TimeFormat is the time format used for file logging.
TimeFormat *string
}
24 changes: 18 additions & 6 deletions node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,25 @@ func New(conf *Config) (*Node, error) {
conf.DataDir = absdatadir
}
if conf.LogConfig != nil {
logFilePath := ""
if conf.LogConfig.FileRoot == "" {
logFilePath = path.Join(conf.DataDir, conf.LogConfig.FilePath)
} else {
logFilePath = path.Join(conf.LogConfig.FileRoot, conf.LogConfig.FilePath)
if conf.LogConfig.TermTimeFormat != nil && *conf.LogConfig.TermTimeFormat != "" {
log.SetTermTimeFormat(*conf.LogConfig.TermTimeFormat)
}

if conf.LogConfig.TimeFormat != nil && *conf.LogConfig.TimeFormat != "" {
log.SetTimeFormat(*conf.LogConfig.TimeFormat)
}

if conf.LogConfig.FileRoot != nil && conf.LogConfig.FilePath != nil &&
conf.LogConfig.MaxBytesSize != nil && conf.LogConfig.Level != nil {
brilliant-lx marked this conversation as resolved.
Show resolved Hide resolved
// log to file
logFilePath := ""
if *conf.LogConfig.FileRoot == "" {
logFilePath = path.Join(conf.DataDir, *conf.LogConfig.FilePath)
} else {
logFilePath = path.Join(*conf.LogConfig.FileRoot, *conf.LogConfig.FilePath)
}
log.Root().SetHandler(log.NewFileLvlHandler(logFilePath, *conf.LogConfig.MaxBytesSize, *conf.LogConfig.Level))
}
log.Root().SetHandler(log.NewFileLvlHandler(logFilePath, conf.LogConfig.MaxBytesSize, conf.LogConfig.Level))
}
if conf.Logger == nil {
conf.Logger = log.New()
Expand Down