nik/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-08-01 07:21:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(logger): handle file log exception for log.Log (#5700)

Browse Source 
* fix(logger): handle file log exception for log.Log

* simplify logger, enhance test

---------

Co-authored-by: Deluan Quintão <deluan@navidrome.org>
This commit is contained in:
Kendall Garner 2026-07-02 04:27:39 +00:00 committed by GitHub
parent e80a7937e8
commit a77834ce73
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
log/log.go
View File

@ -193,34 +193,39 @@ func IsGreaterOrEqualTo(level Level) bool {
}
func Fatal(args ...any) {
Log(LevelFatal, args...)
log(LevelFatal, args...)
os.Exit(1)
}
func Error(args ...any) {
Log(LevelError, args...)
log(LevelError, args...)
}
func Warn(args ...any) {
Log(LevelWarn, args...)
log(LevelWarn, args...)
}
func Info(args ...any) {
Log(LevelInfo, args...)
log(LevelInfo, args...)
}
func Debug(args ...any) {
Log(LevelDebug, args...)
log(LevelDebug, args...)
}
func Trace(args ...any) {
Log(LevelTrace, args...)
log(LevelTrace, args...)
}
func Log(level Level, args ...any) {
log(level, args...)
}
func log(level Level, args ...any) {
if !shouldLog(level, 3) {
return
}
logger, msg := parseArgs(args)
logger.Log(logrus.Level(level), msg)
}

30
log/log_test.go
View File

@ -135,18 +135,32 @@ var _ = Describe("Logger", func() {
})
Describe("LogLevels", func() {
It("logs at specific levels", func() {
SetLevel(LevelError)
Debug("message 1")
BeforeEach(func() {
SetLevel(LevelFatal)
SetLogLevels(nil)
})
DescribeTable("logs at specific levels", func(logger func(...any), level Level) {
logger("message 1")
Expect(hook.LastEntry()).To(BeNil())
SetLogLevels(map[string]string{
"log/log_test": "debug",
})
Log(level, "message 1.5")
Expect(hook.LastEntry()).To(BeNil())
Debug("message 2")
SetLogLevels(map[string]string{"log/log_test": "trace"})
logger("message 2")
Expect(hook.LastEntry().Message).To(Equal("message 2"))
})
Log(level, "message 2.5")
Expect(hook.LastEntry().Message).To(Equal("message 2.5"))
},
Entry("Error", Error, LevelError),
Entry("Warn", Warn, LevelWarn),
Entry("Info", Info, LevelInfo),
Entry("Debug", Debug, LevelDebug),
Entry("Trace", Trace, LevelTrace),
)
})
Describe("IsGreaterOrEqualTo", func() {