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

Update linux events topic

Browse Source 
This also remove the duplicate events for Task{Create,Start,Delete}

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2017-07-18 13:47:28 +02:00
parent 4888d40ac7
commit a578730a94
No known key found for this signature in database
GPG Key ID: 40CF16616B361216
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
linux/shim/service.go
View File

@ -404,23 +404,23 @@ func (s *Service) forward(client poster) {
func getTopic(e interface{}) string { func getTopic(e interface{}) string {
switch e.(type) { switch e.(type) {
case *events.TaskCreate: case *events.TaskCreate:
return "task-create" return "/tasks/create"
case *events.TaskStart: case *events.TaskStart:
return "task-start" return "/tasks/start"
case *events.TaskOOM: case *events.TaskOOM:
return "task-oom" return "/tasks/oom"
case *events.TaskExit: case *events.TaskExit:
return "task-exit" return "/tasks/exit"
case *events.TaskDelete: case *events.TaskDelete:
return "task-delete" return "/tasks/delete"
case *events.TaskExecAdded: case *events.TaskExecAdded:
return "task-exec-added" return "/tasks/exec-added"
case *events.TaskPaused: case *events.TaskPaused:
return "task-paused" return "/tasks/paused"
case *events.TaskResumed: case *events.TaskResumed:
return "task-resumed" return "/tasks/resumed"
case *events.TaskCheckpointed: case *events.TaskCheckpointed:
return "task-checkpointed" return "/tasks/checkpointed"
} }
return "?" return "?"
} }

20
services/tasks/service.go
View File

@ -9,7 +9,6 @@ import (
"path/filepath" "path/filepath"
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
api "github.com/containerd/containerd/api/services/tasks/v1" api "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/api/types/task"
@ -148,12 +147,6 @@ func (s *Service) Create(ctx context.Context, r *api.CreateTaskRequest) (*api.Cr
log.G(ctx).Error(err) log.G(ctx).Error(err)
} }
if err := s.emit(ctx, "/tasks/create", &eventsapi.TaskCreate{
ContainerID: r.ContainerID,
}); err != nil {
return nil, err
}
return &api.CreateTaskResponse{ return &api.CreateTaskResponse{
ContainerID: r.ContainerID, ContainerID: r.ContainerID,
Pid: state.Pid, Pid: state.Pid,
@ -169,12 +162,6 @@ func (s *Service) Start(ctx context.Context, r *api.StartTaskRequest) (*google_p
return nil, err return nil, err
} }
if err := s.emit(ctx, "/tasks/start", &eventsapi.TaskStart{
ContainerID: r.ContainerID,
}); err != nil {
return nil, err
}
return empty, nil return empty, nil
} }
@ -191,13 +178,6 @@ func (s *Service) Delete(ctx context.Context, r *api.DeleteTaskRequest) (*api.De
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err := s.emit(ctx, "/tasks/delete", &eventsapi.TaskDelete{
ContainerID: r.ContainerID,
Pid: exit.Pid,
ExitStatus: exit.Status,
}); err != nil {
return nil, err
}
return &api.DeleteResponse{ return &api.DeleteResponse{
ExitStatus: exit.Status, ExitStatus: exit.Status,
ExitedAt: exit.Timestamp, ExitedAt: exit.Timestamp,