Skip to content
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
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
34 changes: 34 additions & 0 deletions levels.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,37 @@ func LevelFromString(level string) (LogLevel, error) {
err := lvl.Set(level)
return LogLevel(lvl), err
}

// GetLogLevel returns the current log level for a given subsystem as a string.
// Passing name="*" or name="" returns the defaultLevel.
func GetLogLevel(name string) (string, error) {
if name == "*" || name == "" {
loggerMutex.RLock()
defLvl := defaultLevel
loggerMutex.RUnlock()
return zapcore.Level(defLvl).String(), nil
}
if lvl, ok := levels[name]; ok {
return zapcore.Level(LogLevel(lvl.Level())).String(), nil

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return zapcore.Level(LogLevel(lvl.Level())).String(), nil
return lvl.Level().String(), nil

}
return "", ErrNoSuchLogger
}

// GetAllLogLevels returns a map of all current log levels for all subsystems as strings.
// The map includes a special "*" key that represents the defaultLevel.
func GetAllLogLevels() map[string]string {
result := make(map[string]string, len(levels)+1)

// Add the default level with "*" key
loggerMutex.RLock()
defLvl := defaultLevel
loggerMutex.RUnlock()
result["*"] = zapcore.Level(defLvl).String()

// Add all subsystem levels
for name, level := range levels {
result[name] = zapcore.Level(LogLevel(level.Level())).String()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
result[name] = zapcore.Level(LogLevel(level.Level())).String()
result[name] = level.Level().String()

}

return result
}
129 changes: 129 additions & 0 deletions log_level_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,23 @@ import (
"encoding/json"
"io"
"testing"

"go.uber.org/zap/zapcore"
)

func TestLogLevel(t *testing.T) {
const subsystem = "log-level-test"

// Save original config and restore after test
originalConfig := GetConfig()
defer SetupLogging(originalConfig)

// Reset to a known state with error level default
SetupLogging(Config{
Level: LevelError,
Stderr: true,
})

logger := Logger(subsystem)
reader := NewPipeReader()
done := make(chan struct{})
Expand Down Expand Up @@ -51,3 +64,119 @@ func TestLogLevel(t *testing.T) {
}
<-done
}

// Helper function to clear logger state between tests
func clearLoggerState() {
clear(loggers)
clear(levels)
}

func TestGetDefaultLevel(t *testing.T) {
originalConfig := GetConfig()
defer SetupLogging(originalConfig)

// Clear any state from previous tests first
clearLoggerState()

testCases := []LogLevel{LevelDebug, LevelInfo, LevelWarn, LevelError}

for _, expected := range testCases {
SetupLogging(Config{Level: expected, Stderr: true})

// empty string arg
lvl, err := GetLogLevel("")
if err != nil {
t.Errorf("GetLogLevel() returned error: %v", err)
} else if lvl != zapcore.Level(expected).String() {
t.Errorf("GetLogLevel() = %v, want %v", lvl, zapcore.Level(expected).String())
}

// explicit "*"
lvl, err = GetLogLevel("*")
if err != nil {
t.Errorf(`GetLogLevel("*") returned error: %v`, err)
} else if lvl != zapcore.Level(expected).String() {
t.Errorf(`GetLogLevel("*") = %v, want %v`, lvl, zapcore.Level(expected).String())
}

// empty string
lvl, err = GetLogLevel("")
if err != nil {
t.Errorf(`GetLogLevel("") returned error: %v`, err)
} else if lvl != zapcore.Level(expected).String() {
t.Errorf(`GetLogLevel("") = %v, want %v`, lvl, zapcore.Level(expected).String())
}
}
}

func TestGetAllLogLevels(t *testing.T) {
originalConfig := GetConfig()
defer SetupLogging(originalConfig)

// Clear any state from previous tests first
clearLoggerState()

SetupLogging(Config{Level: LevelWarn, Stderr: true})
base := GetAllLogLevels()

if len(base) != 1 {
t.Errorf("baseline GetAllLogLevels() length = %d; want 1", len(base))
}
if base["*"] != zapcore.Level(LevelWarn).String() {
t.Errorf("baseline GetAllLogLevels()[\"*\"] = %v; want %v", base["*"], zapcore.Level(LevelWarn).String())
}

expected := map[string]LogLevel{
"test1": LevelDebug,
"test2": LevelInfo,
"test3": LevelWarn,
}
SetupLogging(Config{
Level: LevelError,
SubsystemLevels: expected,
Stderr: true,
})

all := GetAllLogLevels()

if all["*"] != zapcore.Level(LevelError).String() {
t.Errorf(`GetAllLogLevels()["*"] = %v; want %v`, all["*"], zapcore.Level(LevelError).String())
}
for name, want := range expected {
got, ok := all[name]
if !ok {
t.Errorf("missing key %q in GetAllLogLevels()", name)
continue
}
if got != zapcore.Level(want).String() {
t.Errorf(`GetAllLogLevels()["%s"] = %v; want %v`, name, got, zapcore.Level(want).String())
}
}

// dynamic logger test
_ = Logger("dynamic")
if err := SetLogLevel("dynamic", "fatal"); err != nil {
t.Fatalf("SetLogLevel(dynamic) failed: %v", err)
}

all = GetAllLogLevels()
if lvl, ok := all["dynamic"]; !ok {
t.Error(`missing "dynamic" key after creation`)
} else if lvl != zapcore.Level(LevelFatal).String() {
t.Errorf(`GetAllLogLevels()["dynamic"] = %v; want %v`, lvl, zapcore.Level(LevelFatal).String())
}

// ensure immutability
snapshot := GetAllLogLevels()
snapshot["*"] = zapcore.Level(LevelDebug).String()
snapshot["newkey"] = zapcore.Level(LevelInfo).String()

// ensure original state unchanged
fresh := GetAllLogLevels()
if fresh["*"] != zapcore.Level(LevelError).String() {
t.Errorf(`immutable check failed: fresh["*"] = %v; want %v`, fresh["*"], zapcore.Level(LevelError).String())
}
if _, exists := fresh["newkey"]; exists {
t.Error(`immutable check failed: "newkey" should not leak into real map`)
}
}
2 changes: 2 additions & 0 deletions setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ var levels = make(map[string]zap.AtomicLevel)
var primaryFormat LogFormat = ColorizedOutput

// defaultLevel is the default log level
// New loggers will be set to `defaultLevel` when created
var defaultLevel LogLevel = LevelError

// primaryCore is the primary logging core
Expand Down Expand Up @@ -205,6 +206,7 @@ func SetLogLevel(name, level string) error {
// wildcard, change all
if name == "*" {
SetAllLoggers(lvl)
defaultLevel = lvl
return nil
}

Expand Down
Loading