From bf8694e709ab993b68e7a0624722430644d2db38 Mon Sep 17 00:00:00 2001 From: Will Browne Date: Mon, 31 Jan 2022 15:24:51 +0100 Subject: [PATCH] Plugins: Amend plugins loader log statements (#44652) * adjust log statements * Update pkg/plugins/manager/loader/loader.go Co-authored-by: Marcus Efraimsson * add errs to logs Co-authored-by: Marcus Efraimsson --- pkg/plugins/manager/loader/loader.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/plugins/manager/loader/loader.go b/pkg/plugins/manager/loader/loader.go index e438d9a5cbc..db4e36e674f 100644 --- a/pkg/plugins/manager/loader/loader.go +++ b/pkg/plugins/manager/loader/loader.go @@ -75,18 +75,18 @@ func (l *Loader) loadPlugins(ctx context.Context, class plugins.Class, pluginJSO for _, pluginJSONPath := range pluginJSONPaths { plugin, err := l.readPluginJSON(pluginJSONPath) if err != nil { - l.log.Warn("Skipping plugin loading as it's plugin.json is invalid", "id", plugin.ID) + l.log.Warn("Skipping plugin loading as its plugin.json could not be read", "path", pluginJSONPath, "err", err) continue } pluginJSONAbsPath, err := filepath.Abs(pluginJSONPath) if err != nil { - l.log.Warn("Skipping plugin loading as full plugin.json path could not be calculated", "id", plugin.ID) + l.log.Warn("Skipping plugin loading as absolute plugin.json path could not be calculated", "pluginID", plugin.ID, "err", err) continue } if _, dupe := foundPlugins[filepath.Dir(pluginJSONAbsPath)]; dupe { - l.log.Warn("Skipping plugin loading as it's a duplicate", "id", plugin.ID) + l.log.Warn("Skipping plugin loading as it's a duplicate", "pluginID", plugin.ID) continue } foundPlugins[filepath.Dir(pluginJSONAbsPath)] = plugin