Skip to content

feat: pretty logs managed in the configuration #6

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

Merged
merged 1 commit into from
Jul 17, 2023
Merged

feat: pretty logs managed in the configuration #6

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
10 changes: 6 additions & 4 deletions cmd/data-aggregation-api/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ import (
"github.com/criteo/data-aggregation-api/internal/report"
)

func configureLogging(logLevel string) error {
func configureLogging(logLevel string, pretty bool) error {
level, err := zerolog.ParseLevel(logLevel)
if err != nil {
return fmt.Errorf("failed to parse log level '%s': %w", logLevel, err)
}
zerolog.SetGlobalLevel(level)
zerolog.TimeFieldFormat = zerolog.TimeFormatUnix //nolint:reassign // it is the way
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr}) //nolint:reassign // it is the way
zerolog.TimeFieldFormat = zerolog.TimeFormatUnix //nolint:reassign // it is the way
if pretty {
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr}) //nolint:reassign // it is the way
}

return nil
}
Expand All @@ -42,7 +44,7 @@ func run() error {
if err := config.LoadConfig(); err != nil {
return err
}
if err := configureLogging(config.Cfg.LogLevel); err != nil {
if err := configureLogging(config.Cfg.Log.Level, config.Cfg.Log.Pretty); err != nil {
return err
}

Expand Down
8 changes: 6 additions & 2 deletions internal/config/settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ type Config struct {
URL string
APIKey string
}
LogLevel string
Log struct {
Level string
Pretty bool
}
Datacenter string
API struct {
ListenAddress string
Expand All @@ -50,7 +53,8 @@ type LDAPConfig struct {

func setDefaults() {
viper.SetDefault("Datacenter", "")
viper.SetDefault("LogLevel", "info")
viper.SetDefault("Log.Level", "info")
viper.SetDefault("Log.Pretty", false)

viper.SetDefault("API.ListenAddress", defaultListenAddress)
viper.SetDefault("API.ListenPort", defaultListenPort)
Expand Down
4 changes: 4 additions & 0 deletions settings.example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ API:
ListenAddress: "127.0.0.1"
ListenPort: 1234

Log:
Level: "info"
Pretty: true

Authentication:
LDAP:
InsecureSkipVerify: "false"
Expand Down