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

Merge pull request #1014 from ijc/log-when-skipping-a-plugin

Browse Source 
Do not claim to be loading a plugin which we aren't.
This commit is contained in:
Kenfe-Mickaël Laventure 2017-06-15 07:31:46 -07:00 committed by GitHub
commit 40fbd282cc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/containerd/main.go
View File

@ -117,10 +117,11 @@ func main() {
) )
for _, init := range plugin.Graph() { for _, init := range plugin.Graph() {
id := init.URI() id := init.URI()
log.G(global).WithField("type", init.Type).Infof("loading plugin %q...", id)
if !shouldLoad(init) { if !shouldLoad(init) {
log.G(global).WithField("type", init.Type).Infof("skipping plugin %q...", id)
continue continue
} }
log.G(global).WithField("type", init.Type).Infof("loading plugin %q...", id)
ic := plugin.NewContext(plugins) ic := plugin.NewContext(plugins)
ic.Root = filepath.Join(conf.Root, id) ic.Root = filepath.Join(conf.Root, id)
ic.Context = log.WithModule(global, id) ic.Context = log.WithModule(global, id)