toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow plugins to have multiple handlers

Browse Source 
Currently the plugins pkg allows a single handler. This assumption
breaks down if there are mutiple listeners to a plugin of a certain
Manifest such as NetworkDriver or IpamDriver when swarm-mode is enabled.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 5e9c78aeaf1d88000921190b88a1d91d6261208c
Component: engine
This commit is contained in:
Madhu Venugopal
2016-10-14 22:40:28 -07:00
parent b3348bdb01
commit 1050d22554
4 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/plugin/store/defs.go
View File

@ -15,7 +15,7 @@ type Store struct {
/* handlers are necessary for transition path of legacy plugins
* to the new model. Legacy plugins use Handle() for registering an
* activation callback.*/
handlers map[string]func(string, *plugins.Client)
handlers map[string][]func(string, *plugins.Client)
nameToID map[string]string
plugindb string
}
@ -24,7 +24,7 @@ type Store struct {
func NewStore(libRoot string) *Store {
return &Store{
plugins: make(map[string]*v2.Plugin),
handlers: make(map[string]func(string, *plugins.Client)),
handlers: make(map[string][]func(string, *plugins.Client)),
nameToID: make(map[string]string),
plugindb: filepath.Join(libRoot, "plugins", "plugins.json"),
}

9
components/engine/plugin/store/store_experimental.go
View File

@ -212,7 +212,12 @@ func (ps *Store) Handle(capability string, callback func(string, *plugins.Client
// Register callback with new plugin model.
ps.Lock()
ps.handlers[pluginType] = callback
handlers, ok := ps.handlers[pluginType]
if !ok {
handlers = []func(string, *plugins.Client){}
}
handlers = append(handlers, callback)
ps.handlers[pluginType] = handlers
ps.Unlock()
// Register callback with legacy plugin model.
@ -224,7 +229,7 @@ func (ps *Store) Handle(capability string, callback func(string, *plugins.Client
// CallHandler calls the registered callback. It is invoked during plugin enable.
func (ps *Store) CallHandler(p *v2.Plugin) {
for _, typ := range p.GetTypes() {
if handler := ps.handlers[typ.String()]; handler != nil {
for _, handler := range ps.handlers[typ.String()] {
handler(p.Name(), p.Client())
}
}