From c6e7030e03c9e3484fa8b89d789791fa2d68988e Mon Sep 17 00:00:00 2001 From: Maria A Nunez Date: Mon, 10 Feb 2020 14:45:19 -0500 Subject: [PATCH] MM-19445 - Fix conditional for plugin version diagnostics (#13844) * Merge upstream * Adding plugin version data if no error * linting Co-authored-by: Jason Paul Deland <9366595+jaydeland@users.noreply.github.com> --- app/diagnostics.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/diagnostics.go b/app/diagnostics.go index 937c6a7014..c1d27a5213 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -635,8 +635,10 @@ func (a *App) trackConfig() { } pluginsEnvironment := a.GetPluginsEnvironment() - plugins, appErr := pluginsEnvironment.Available() - if appErr != nil { + + if plugins, appErr := pluginsEnvironment.Available(); appErr != nil { + mlog.Error("Unable to add plugin versions to diagnostics", mlog.Err(appErr)) + } else { pluginConfigData["version_antivirus"] = pluginVersion(plugins, "antivirus") pluginConfigData["version_autolink"] = pluginVersion(plugins, "mattermost-autolink") pluginConfigData["version_aws_sns"] = pluginVersion(plugins, "com.mattermost.aws-sns")