 a615a6fe5d
			
		
	
	a615a6fe5d
	
	
	
		
			
			In the course of setting out to add filters and address some cleanup, it was found that we had a few problems in the events subsystem that needed addressing before moving forward. The biggest change was to move to the more standard terminology of publish and subscribe. We make this terminology change across the Go interface and the GRPC API, making the behavior more familier. The previous system was very context-oriented, which is no longer required. With this, we've removed a large amount of dead and unneeded code. Event transactions, context storage and the concept of `Poster` is gone. This has been replaced in most places with a `Publisher`, which matches the actual usage throughout the codebase, removing the need for helpers. There are still some questions around the way events are handled in the shim. Right now, we've preserved some of the existing bugs which may require more extensive changes to resolve correctly. Signed-off-by: Stephen J Day <stephen.day@docker.com>
		
			
				
	
	
		
			44 lines
		
	
	
		
			932 B
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			44 lines
		
	
	
		
			932 B
		
	
	
	
		
			Go
		
	
	
	
	
	
| package plugin
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"fmt"
 | |
| 	"path/filepath"
 | |
| 
 | |
| 	"github.com/containerd/containerd/events"
 | |
| 	"github.com/containerd/containerd/log"
 | |
| )
 | |
| 
 | |
| func NewContext(ctx context.Context, plugins map[PluginType]map[string]interface{}, root, id string) *InitContext {
 | |
| 	return &InitContext{
 | |
| 		plugins: plugins,
 | |
| 		Root:    filepath.Join(root, id),
 | |
| 		Context: log.WithModule(ctx, id),
 | |
| 	}
 | |
| }
 | |
| 
 | |
| type InitContext struct {
 | |
| 	Root    string
 | |
| 	Address string
 | |
| 	Context context.Context
 | |
| 	Config  interface{}
 | |
| 	Events  *events.Exchange
 | |
| 
 | |
| 	plugins map[PluginType]map[string]interface{}
 | |
| }
 | |
| 
 | |
| func (i *InitContext) Get(t PluginType) (interface{}, error) {
 | |
| 	for _, v := range i.plugins[t] {
 | |
| 		return v, nil
 | |
| 	}
 | |
| 	return nil, fmt.Errorf("no plugins registered for %s", t)
 | |
| }
 | |
| 
 | |
| func (i *InitContext) GetAll(t PluginType) (map[string]interface{}, error) {
 | |
| 	p, ok := i.plugins[t]
 | |
| 	if !ok {
 | |
| 		return nil, fmt.Errorf("no plugins registered for %s", t)
 | |
| 	}
 | |
| 	return p, nil
 | |
| }
 |