Remove runtime.Event types

This uses the events service types for runtime events

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-06-28 10:33:36 -07:00
parent 7c8acca29a
commit 040558cf81
15 changed files with 271 additions and 596 deletions

View File

@@ -16,7 +16,7 @@ import (
"github.com/Microsoft/hcsshim"
"github.com/Sirupsen/logrus"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/windows/pid"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
@@ -216,7 +216,7 @@ func (c *Container) CloseIO(ctx context.Context, pid uint32) error {
return proc.CloseStdin()
}
func (c *Container) ResizePty(ctx context.Context, pid uint32, size plugin.ConsoleSize) error {
func (c *Container) ResizePty(ctx context.Context, pid uint32, size runtime.ConsoleSize) error {
var proc *Process
c.Lock()
for _, p := range c.processes {

View File

@@ -7,7 +7,7 @@ import (
"time"
"github.com/Microsoft/hcsshim"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/runtime"
"github.com/pkg/errors"
)
@@ -35,14 +35,14 @@ func (p *Process) ExitedAt() time.Time {
return p.exitedAt
}
func (p *Process) Status() plugin.Status {
func (p *Process) Status() runtime.Status {
select {
case <-p.ecSync:
return plugin.StoppedStatus
return runtime.StoppedStatus
default:
}
return plugin.RunningStatus
return runtime.RunningStatus
}
func (p *Process) Delete() error {