From 50db9810e828952cf8006af71144f400236c9841 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 10 Jan 2018 11:49:40 +0100
Subject: [PATCH] uses pluginmanagers log instead of global

---
 pkg/log/log.go                     |  4 ++--
 pkg/plugins/backend/log-wrapper.go | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkg/log/log.go b/pkg/log/log.go
index 9b3f8b27071..88b90f0cf8e 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -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 {
diff --git a/pkg/plugins/backend/log-wrapper.go b/pkg/plugins/backend/log-wrapper.go
index c4f7d80b856..94f1e9c5be4 100644
--- a/pkg/plugins/backend/log-wrapper.go
+++ b/pkg/plugins/backend/log-wrapper.go
@@ -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 {