From 09de4f1fcc72093e0234d37175bce13f9a1f1587 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 15 Nov 2023 13:06:52 +0100 Subject: [PATCH] services/server: rename var that collided with import Signed-off-by: Sebastiaan van Stijn --- services/server/server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/server/server.go b/services/server/server.go index f013f3800..fb6a3bbb0 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -341,12 +341,12 @@ func New(ctx context.Context, config *srvconfig.Config) (*Server, error) { // recordConfigDeprecations attempts to record use of any deprecated config field. Failures are logged and ignored. func recordConfigDeprecations(ctx context.Context, config *srvconfig.Config, set *plugin.Set) { // record any detected deprecations without blocking server startup - plugin := set.Get(plugins.WarningPlugin, plugins.DeprecationsPlugin) - if plugin == nil { + p := set.Get(plugins.WarningPlugin, plugins.DeprecationsPlugin) + if p == nil { log.G(ctx).Warn("failed to find warning service to record deprecations") return } - instance, err := plugin.Instance() + instance, err := p.Instance() if err != nil { log.G(ctx).WithError(err).Warn("failed to load warning service to record deprecations") return