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

Move errors to plugin pkg

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-05-11 15:25:26 -07:00
parent 01b9f5ec67
commit 466e14aa71
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
errors.go → plugin/errors.go
View File

@ -1,4 +1,4 @@
package containerd package plugin
import "errors" import "errors"

6
services/execution/service.go
View File

@ -84,7 +84,7 @@ func (s *Service) Create(ctx context.Context, r *api.CreateRequest) (*api.Create
s.mu.Lock() s.mu.Lock()
if _, ok := s.containers[r.ID]; ok { if _, ok := s.containers[r.ID]; ok {
s.mu.Unlock() s.mu.Unlock()
return nil, containerd.ErrContainerExists return nil, plugin.ErrContainerExists
} }
c, err := runtime.Create(ctx, r.ID, opts) c, err := runtime.Create(ctx, r.ID, opts)
if err != nil { if err != nil {
@ -286,7 +286,7 @@ func (s *Service) getContainer(id string) (plugin.Container, error) {
c, ok := s.containers[id] c, ok := s.containers[id]
s.mu.Unlock() s.mu.Unlock()
if !ok { if !ok {
return nil, containerd.ErrContainerNotExist return nil, plugin.ErrContainerNotExist
} }
return c, nil return c, nil
} }
@ -294,7 +294,7 @@ func (s *Service) getContainer(id string) (plugin.Container, error) {
func (s *Service) getRuntime(name string) (plugin.Runtime, error) { func (s *Service) getRuntime(name string) (plugin.Runtime, error) {
runtime, ok := s.runtimes[name] runtime, ok := s.runtimes[name]
if !ok { if !ok {
return nil, containerd.ErrUnknownRuntime return nil, plugin.ErrUnknownRuntime
} }
return runtime, nil return runtime, nil
} }