IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fallback to the v8 logging behavior (#47353)

Browse Source
This commit is contained in:
ying-jeanne 2022-04-05 20:15:41 +02:00 committed by GitHub
parent 4f7dae3e6b
commit c525db9cd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/infra/log/log.go
View File

@ -7,6 +7,7 @@ package log
import ( import (
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"sort" "sort"
@ -41,8 +42,10 @@ func init() {
loggersToClose = make([]DisposableHandler, 0) loggersToClose = make([]DisposableHandler, 0)
loggersToReload = make([]ReloadableHandler, 0) loggersToReload = make([]ReloadableHandler, 0)
// Use console by default // Use discard by default
format := getLogFormat("console") format := func(w io.Writer) gokitlog.Logger {
return gokitlog.NewLogfmtLogger(gokitlog.NewSyncWriter(ioutil.Discard))
}
logger := level.NewFilter(format(os.Stderr), level.AllowInfo()) logger := level.NewFilter(format(os.Stderr), level.AllowInfo())
root = newManager(logger) root = newManager(logger)
} }

2
pkg/tests/testinfra/testinfra.go
View File

@ -177,8 +177,6 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
logSect, err := cfg.NewSection("log") logSect, err := cfg.NewSection("log")
require.NoError(t, err) require.NoError(t, err)
_, err = logSect.NewKey("mode", "console")
require.NoError(t, err)
_, err = logSect.NewKey("level", "debug") _, err = logSect.NewKey("level", "debug")
require.NoError(t, err) require.NoError(t, err)