Update linux events topic
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:
		| @@ -404,23 +404,23 @@ func (s *Service) forward(client poster) { | ||||
| func getTopic(e interface{}) string { | ||||
| 	switch e.(type) { | ||||
| 	case *events.TaskCreate: | ||||
| 		return "task-create" | ||||
| 		return "/tasks/create" | ||||
| 	case *events.TaskStart: | ||||
| 		return "task-start" | ||||
| 		return "/tasks/start" | ||||
| 	case *events.TaskOOM: | ||||
| 		return "task-oom" | ||||
| 		return "/tasks/oom" | ||||
| 	case *events.TaskExit: | ||||
| 		return "task-exit" | ||||
| 		return "/tasks/exit" | ||||
| 	case *events.TaskDelete: | ||||
| 		return "task-delete" | ||||
| 		return "/tasks/delete" | ||||
| 	case *events.TaskExecAdded: | ||||
| 		return "task-exec-added" | ||||
| 		return "/tasks/exec-added" | ||||
| 	case *events.TaskPaused: | ||||
| 		return "task-paused" | ||||
| 		return "/tasks/paused" | ||||
| 	case *events.TaskResumed: | ||||
| 		return "task-resumed" | ||||
| 		return "/tasks/resumed" | ||||
| 	case *events.TaskCheckpointed: | ||||
| 		return "task-checkpointed" | ||||
| 		return "/tasks/checkpointed" | ||||
| 	} | ||||
| 	return "?" | ||||
| } | ||||
|   | ||||
| @@ -9,7 +9,6 @@ import ( | ||||
| 	"path/filepath" | ||||
|  | ||||
| 	"github.com/boltdb/bolt" | ||||
| 	eventsapi "github.com/containerd/containerd/api/services/events/v1" | ||||
| 	api "github.com/containerd/containerd/api/services/tasks/v1" | ||||
| 	"github.com/containerd/containerd/api/types" | ||||
| 	"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) | ||||
| 	} | ||||
|  | ||||
| 	if err := s.emit(ctx, "/tasks/create", &eventsapi.TaskCreate{ | ||||
| 		ContainerID: r.ContainerID, | ||||
| 	}); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | ||||
| 	return &api.CreateTaskResponse{ | ||||
| 		ContainerID: r.ContainerID, | ||||
| 		Pid:         state.Pid, | ||||
| @@ -169,12 +162,6 @@ func (s *Service) Start(ctx context.Context, r *api.StartTaskRequest) (*google_p | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | ||||
| 	if err := s.emit(ctx, "/tasks/start", &eventsapi.TaskStart{ | ||||
| 		ContainerID: r.ContainerID, | ||||
| 	}); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | ||||
| 	return empty, nil | ||||
| } | ||||
|  | ||||
| @@ -191,13 +178,6 @@ func (s *Service) Delete(ctx context.Context, r *api.DeleteTaskRequest) (*api.De | ||||
| 	if err != nil { | ||||
| 		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{ | ||||
| 		ExitStatus: exit.Status, | ||||
| 		ExitedAt:   exit.Timestamp, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Kenfe-Mickael Laventure
					Kenfe-Mickael Laventure