IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-18 00:54:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Logging: Fix don't return an error trying to initialize the file logger (#42952)

Browse Source 
Fixes #42897

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
This commit is contained in:
bolshoytoster
2022-02-03 18:17:25 +01:00
committed by GitHub
co-authored by Marcus Efraimsson
parent 8217d6d206
commit 7f2d3055d8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/infra/log/log.go
+2 -2
View File
@@ -417,7 +417,7 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) error {
dpath := filepath.Dir(fileName) dpath := filepath.Dir(fileName)
if err := os.MkdirAll(dpath, os.ModePerm); err != nil { if err := os.MkdirAll(dpath, os.ModePerm); err != nil {
_ = level.Error(root).Log("Failed to create directory", "dpath", dpath, "err", err) _ = level.Error(root).Log("Failed to create directory", "dpath", dpath, "err", err)
return errutil.Wrapf(err, "failed to create log directory %q", dpath) continue
} }
fileHandler := NewFileWriter() fileHandler := NewFileWriter()
fileHandler.Filename = fileName fileHandler.Filename = fileName
@@ -429,7 +429,7 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) error {
fileHandler.Maxdays = sec.Key("max_days").MustInt64(7) fileHandler.Maxdays = sec.Key("max_days").MustInt64(7)
if err := fileHandler.Init(); err != nil { if err := fileHandler.Init(); err != nil {
_ = level.Error(root).Log("Failed to initialize file handler", "dpath", dpath, "err", err) _ = level.Error(root).Log("Failed to initialize file handler", "dpath", dpath, "err", err)
return errutil.Wrapf(err, "failed to initialize file handler") continue
} }
loggersToClose = append(loggersToClose, fileHandler) loggersToClose = append(loggersToClose, fileHandler)