github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

services/server: rename var that collided with import

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-11-15 13:06:52 +01:00
parent 14e621cf91
commit 09de4f1fcc
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/server/server.go
View File

@ -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. // 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) { func recordConfigDeprecations(ctx context.Context, config *srvconfig.Config, set *plugin.Set) {
// record any detected deprecations without blocking server startup // record any detected deprecations without blocking server startup
plugin := set.Get(plugins.WarningPlugin, plugins.DeprecationsPlugin) p := set.Get(plugins.WarningPlugin, plugins.DeprecationsPlugin)
if plugin == nil { if p == nil {
log.G(ctx).Warn("failed to find warning service to record deprecations") log.G(ctx).Warn("failed to find warning service to record deprecations")
return return
} }
instance, err := plugin.Instance() instance, err := p.Instance()
if err != nil { if err != nil {
log.G(ctx).WithError(err).Warn("failed to load warning service to record deprecations") log.G(ctx).WithError(err).Warn("failed to load warning service to record deprecations")
return return