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

runtime/v2/shim: rename var that shadowed package var

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

10
runtime/v2/shim/shim.go
View File

@ -318,8 +318,8 @@ func run(ctx context.Context, manager Manager, name string, config Config) error
) )
for _, p := range registry.Graph(func(*plugin.Registration) bool { return false }) { for _, p := range registry.Graph(func(*plugin.Registration) bool { return false }) {
id := p.URI() pID := p.URI()
log.G(ctx).WithField("type", p.Type).Infof("loading plugin %q...", id) log.G(ctx).WithField("type", p.Type).Infof("loading plugin %q...", pID)
initContext := plugin.NewContext( initContext := plugin.NewContext(
ctx, ctx,
@ -353,14 +353,14 @@ func run(ctx context.Context, manager Manager, name string, config Config) error
instance, err := result.Instance() instance, err := result.Instance()
if err != nil { if err != nil {
if plugin.IsSkipPlugin(err) { if plugin.IsSkipPlugin(err) {
log.G(ctx).WithError(err).WithField("type", p.Type).Infof("skip loading plugin %q...", id) log.G(ctx).WithError(err).WithField("type", p.Type).Infof("skip loading plugin %q...", pID)
continue continue
} }
return fmt.Errorf("failed to load plugin %s: %w", id, err) return fmt.Errorf("failed to load plugin %s: %w", pID, err)
} }
if src, ok := instance.(TTRPCService); ok { if src, ok := instance.(TTRPCService); ok {
log.G(ctx).WithField("id", id).Debug("registering ttrpc service") log.G(ctx).WithField("id", pID).Debug("registering ttrpc service")
ttrpcServices = append(ttrpcServices, src) ttrpcServices = append(ttrpcServices, src)
} }