Skip to content

USHIFT-1043: ignore case when looking at logging level #1657

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
openshift-merge-robot merged 1 commit into from
Apr 14, 2023
Merged

USHIFT-1043: ignore case when looking at logging level #1657

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
21 changes: 10 additions & 11 deletions etcd/vendor/github.com/openshift/microshift/pkg/config/debugging.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 10 additions & 11 deletions pkg/config/debugging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package config

import "strings"

type Debugging struct {
// Valid values are: "Normal", "Debug", "Trace", "TraceAll".
// Defaults to "Normal".
Expand All @@ -8,17 +10,14 @@ type Debugging struct {

// GetVerbosity returns the numerical value for LogLevel which is an enum
func (c *Config) GetVerbosity() int {
var verbosity int
switch c.Debugging.LogLevel {
case "Normal":
verbosity = 2
case "Debug":
verbosity = 4
case "Trace":
verbosity = 6
case "TraceAll":
verbosity = 8
default:
var levelNames = map[string]int{
"normal": 2,
"debug": 4,
"trace": 6,
"traceall": 8,
}
verbosity, ok := levelNames[strings.ToLower(c.Debugging.LogLevel)]
if !ok {
verbosity = 2
}
return verbosity
Expand Down
20 changes: 20 additions & 0 deletions pkg/config/debugging_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,42 @@ func TestGetVerbosity(t *testing.T) {
setting: "Normal",
level: 2,
},
{
setting: "normal",
level: 2,
},
{
setting: "Debug",
level: 4,
},
{
setting: "debug",
level: 4,
},
{
setting: "Trace",
level: 6,
},
{
setting: "trace",
level: 6,
},
{
setting: "TraceAll",
level: 8,
},
{
setting: "traceall",
level: 8,
},
{
setting: "Unknown",
level: 2,
},
{
setting: "unknown",
level: 2,
},
{
setting: "",
level: 2,
Expand Down