From 22e3d2fd35b6fbdf898c4de5a82b723981a5ff31 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Wed, 3 Mar 2021 15:12:26 +0100 Subject: [PATCH] fix log config priority --- settings/pkg/flagset/flagset.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/settings/pkg/flagset/flagset.go b/settings/pkg/flagset/flagset.go index 9ae640d7f1..8a73986e67 100644 --- a/settings/pkg/flagset/flagset.go +++ b/settings/pkg/flagset/flagset.go @@ -11,19 +11,19 @@ func RootWithConfig(cfg *config.Config) []cli.Flag { &cli.StringFlag{ Name: "log-level", Usage: "Set logging level", - EnvVars: []string{"OCIS_LOG_LEVEL"}, + EnvVars: []string{"SETTINGS_LOG_LEVEL", "OCIS_LOG_LEVEL"}, Destination: &cfg.Log.Level, }, &cli.BoolFlag{ Name: "log-pretty", Usage: "Enable pretty logging", - EnvVars: []string{"OCIS_LOG_PRETTY"}, + EnvVars: []string{"SETTINGS_LOG_PRETTY", "OCIS_LOG_PRETTY"}, Destination: &cfg.Log.Pretty, }, &cli.BoolFlag{ Name: "log-color", Usage: "Enable colored logging", - EnvVars: []string{"OCIS_LOG_COLOR"}, + EnvVars: []string{"SETTINGS_LOG_COLOR", "OCIS_LOG_COLOR"}, Destination: &cfg.Log.Color, }, }