Skip to content

fix: apply log level/format before NewRunner() emits startup logs #1192

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

Open
ucpr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: apply log level/format before NewRunner() emits startup logs #1192

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
36 changes: 20 additions & 16 deletions src/service_cmd/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ type Runner struct {
}

func NewRunner(s settings.Settings) Runner {
configureLogger(s)

var store gostats.Store

switch {
Expand Down Expand Up @@ -91,6 +93,24 @@ func NewRunner(s settings.Settings) Runner {
}
}

func configureLogger(s settings.Settings) {
logLevel, err := logger.ParseLevel(s.LogLevel)
if err != nil {
logger.Fatalf("Could not parse log level. %v\n", err)
}
logger.SetLevel(logLevel)

if strings.ToLower(s.LogFormat) == "json" {
logger.SetFormatter(&logger.JSONFormatter{
TimestampFormat: time.RFC3339Nano,
FieldMap: logger.FieldMap{
logger.FieldKeyTime: "@timestamp",
logger.FieldKeyMsg: "@message",
},
})
}
}

func (runner *Runner) GetStatsStore() gostats.Store {
return runner.statsManager.GetStatsStore()
}
Expand Down Expand Up @@ -157,22 +177,6 @@ func (runner *Runner) Run() {
logger.Infof("Tracing disabled")
}

logLevel, err := logger.ParseLevel(s.LogLevel)
if err != nil {
logger.Fatalf("Could not parse log level. %v\n", err)
} else {
logger.SetLevel(logLevel)
}
if strings.ToLower(s.LogFormat) == "json" {
logger.SetFormatter(&logger.JSONFormatter{
TimestampFormat: time.RFC3339Nano,
FieldMap: logger.FieldMap{
logger.FieldKeyTime: "@timestamp",
logger.FieldKeyMsg: "@message",
},
})
}

var localCache *freecache.Cache
if s.LocalCacheSizeInBytes != 0 {
localCache = freecache.NewCache(s.LocalCacheSizeInBytes)
Expand Down