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

uses pluginmanagers log instead of global

Browse Source
This commit is contained in:
bergquist
2018-01-10 11:49:40 +01:00
parent e6921a6a01
commit 50db9810e8
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/log/log.go
View File

@@ -236,8 +236,8 @@ func LogFilterHandler(maxLevel log15.Lvl, filters map[string]log15.Lvl, h log15.
if len(filters) > 0 {
for i := 0; i < len(r.Ctx); i += 2 {
key := r.Ctx[i].(string)
if key == "logger" {
key, ok := r.Ctx[i].(string)
if ok && key == "logger" {
loggerName, strOk := r.Ctx[i+1].(string)
if strOk {
if filterLevel, ok := filters[loggerName]; ok {

17
pkg/plugins/backend/log-wrapper.go
View File

@@ -12,19 +12,19 @@ type LogWrapper struct {
}
func (lw LogWrapper) Trace(msg string, args ...interface{}) {
glog.Debug2(msg, args...)
lw.Logger.Debug(msg, args...)
}
func (lw LogWrapper) Debug(msg string, args ...interface{}) {
glog.Debug2(msg, args...)
lw.Logger.Debug(msg, args...)
}
func (lw LogWrapper) Info(msg string, args ...interface{}) {
glog.Info2(msg, args...)
lw.Logger.Info(msg, args...)
}
func (lw LogWrapper) Warn(msg string, args ...interface{}) {
glog.Warn2(msg, args...)
lw.Logger.Warn(msg, args...)
}
func (lw LogWrapper) Error(msg string, args ...interface{}) {
glog.Error2(msg, args...)
lw.Logger.Error(msg, args...)
}
func (lw LogWrapper) IsTrace() bool { return true }
@@ -34,13 +34,14 @@ func (lw LogWrapper) IsWarn() bool { return true }
func (lw LogWrapper) IsError() bool { return true }
func (lw LogWrapper) With(args ...interface{}) hclog.Logger {
return LogWrapper{Logger: glog.New("logger", args)}
return LogWrapper{Logger: lw.Logger.New(args...)}
}
func (lw LogWrapper) Named(name string) hclog.Logger {
return LogWrapper{Logger: glog.New(name)}
return LogWrapper{Logger: lw.Logger.New()}
}
func (lw LogWrapper) ResetNamed(name string) hclog.Logger {
return LogWrapper{Logger: glog.New(name)}
return LogWrapper{Logger: lw.Logger.New()}
}
func (lw LogWrapper) StandardLogger(ops *hclog.StandardLoggerOptions) *log.Logger {