docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix plugin restart on docker restart 

Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit ab12ed4a5642edb4d96b54b6152f12260093f3ea)
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Victor Vieux 2016-08-09 11:49:28 -07:00 committed by Tibor Vass
parent fdf513e99d
commit 5cc103e9e9
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/backend.go
View File

@ -35,7 +35,7 @@ func (pm *Manager) Enable(name string) error {
if err != nil { if err != nil {
return err return err
} }
if err := pm.enable(p); err != nil { if err := pm.enable(p, false); err != nil {
return err return err
} }
pm.pluginEventLogger(p.PluginObj.ID, name, "enable") pm.pluginEventLogger(p.PluginObj.ID, name, "enable")

2
plugin/manager.go
View File

@ -321,7 +321,7 @@ func (pm *Manager) init() error {
if requiresManualRestore { if requiresManualRestore {
// if liveRestore is not enabled, the plugin will be stopped now so we should enable it // if liveRestore is not enabled, the plugin will be stopped now so we should enable it
if err := pm.enable(p); err != nil { if err := pm.enable(p, true); err != nil {
logrus.Errorf("Error enabling plugin '%s': %s", p.Name(), err) logrus.Errorf("Error enabling plugin '%s': %s", p.Name(), err)
} }
} }

4
plugin/manager_linux.go
View File

@ -20,8 +20,8 @@ import (
"github.com/opencontainers/specs/specs-go" "github.com/opencontainers/specs/specs-go"
) )
func (pm *Manager) enable(p *plugin) error { func (pm *Manager) enable(p *plugin, force bool) error {
if p.PluginObj.Active { if p.PluginObj.Active && !force {
return fmt.Errorf("plugin %s is already enabled", p.Name()) return fmt.Errorf("plugin %s is already enabled", p.Name())
} }
spec, err := pm.initSpec(p) spec, err := pm.initSpec(p)

2
plugin/manager_windows.go
View File

@ -8,7 +8,7 @@ import (
"github.com/opencontainers/specs/specs-go" "github.com/opencontainers/specs/specs-go"
) )
func (pm *Manager) enable(p *plugin) error { func (pm *Manager) enable(p *plugin, force bool) error {
return fmt.Errorf("Not implemented") return fmt.Errorf("Not implemented")
} }