From 8a0ac2117b7560562148c270c15a4bc5ffe7b965 Mon Sep 17 00:00:00 2001
From: Steve Kriss <steve@heptio.com>
Date: Wed, 29 Nov 2017 14:33:41 -0800
Subject: [PATCH] give each plugin its own logrusAdapter

Signed-off-by: Steve Kriss <steve@heptio.com>
---
 pkg/plugin/manager.go | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkg/plugin/manager.go b/pkg/plugin/manager.go
index 9853a59e6..438ef5b6b 100644
--- a/pkg/plugin/manager.go
+++ b/pkg/plugin/manager.go
@@ -128,7 +128,8 @@ type Manager interface {
 }
 
 type manager struct {
-	logger         *logrusAdapter
+	logger         logrus.FieldLogger
+	logLevel       logrus.Level
 	pluginRegistry *registry
 	clientStore    *clientStore
 }
@@ -136,7 +137,8 @@ type manager struct {
 // NewManager constructs a manager for getting plugin implementations.
 func NewManager(logger logrus.FieldLogger, level logrus.Level) (Manager, error) {
 	m := &manager{
-		logger:         &logrusAdapter{impl: logger, level: level},
+		logger:         logger,
+		logLevel:       level,
 		pluginRegistry: newRegistry(),
 		clientStore:    newClientStore(),
 	}
@@ -266,7 +268,7 @@ func (m *manager) getCloudProviderPlugin(name string, kind PluginKind) (interfac
 		// build a plugin client that can dispense all of the PluginKinds it's registered for
 		clientBuilder := newClientBuilder(baseConfig()).
 			withCommand(pluginInfo.commandName, pluginInfo.commandArgs...).
-			withLogger(m.logger)
+			withLogger(&logrusAdapter{impl: m.logger, level: m.logLevel})
 
 		for _, kind := range pluginInfo.kinds {
 			clientBuilder.withPlugin(kind, pluginForKind(kind))
@@ -303,10 +305,11 @@ func (m *manager) GetBackupItemActions(backupName string) ([]backup.ItemAction,
 
 		// create clients for each
 		for _, plugin := range pluginInfo {
+			logger := &logrusAdapter{impl: m.logger, level: m.logLevel}
 			client := newClientBuilder(baseConfig()).
 				withCommand(plugin.commandName, plugin.commandArgs...).
-				withPlugin(PluginKindBackupItemAction, &BackupItemActionPlugin{log: m.logger}).
-				withLogger(m.logger).
+				withPlugin(PluginKindBackupItemAction, &BackupItemActionPlugin{log: logger}).
+				withLogger(logger).
 				client()
 
 			m.clientStore.add(client, PluginKindBackupItemAction, plugin.name, backupName)
@@ -351,10 +354,11 @@ func (m *manager) GetRestoreItemActions(restoreName string) ([]restore.ItemActio
 
 		// create clients for each
 		for _, plugin := range pluginInfo {
+			logger := &logrusAdapter{impl: m.logger, level: m.logLevel}
 			client := newClientBuilder(baseConfig()).
 				withCommand(plugin.commandName, plugin.commandArgs...).
-				withPlugin(PluginKindRestoreItemAction, &RestoreItemActionPlugin{log: m.logger}).
-				withLogger(m.logger).
+				withPlugin(PluginKindRestoreItemAction, &RestoreItemActionPlugin{log: logger}).
+				withLogger(logger).
 				client()
 
 			m.clientStore.add(client, PluginKindRestoreItemAction, plugin.name, restoreName)