From e4beb7c554e4f5fd45f73f16b3cc1bd350a27a76 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Tue, 18 Jul 2017 14:19:48 +0200 Subject: [PATCH] Use constants for runtime event topics Signed-off-by: Kenfe-Mickael Laventure --- linux/shim/service.go | 19 ++++++++++--------- runtime/events.go | 13 +++++++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 runtime/events.go diff --git a/linux/shim/service.go b/linux/shim/service.go index 3ba0268b2..f60eb9df9 100644 --- a/linux/shim/service.go +++ b/linux/shim/service.go @@ -20,6 +20,7 @@ import ( "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/reaper" + "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/typeurl" google_protobuf "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" @@ -404,23 +405,23 @@ func (s *Service) forward(client poster) { func getTopic(e interface{}) string { switch e.(type) { case *events.TaskCreate: - return "/tasks/create" + return runtime.TaskCreateEventTopic case *events.TaskStart: - return "/tasks/start" + return runtime.TaskStartEventTopic case *events.TaskOOM: - return "/tasks/oom" + return runtime.TaskOOMEventTopic case *events.TaskExit: - return "/tasks/exit" + return runtime.TaskExitEventTopic case *events.TaskDelete: - return "/tasks/delete" + return runtime.TaskDeleteEventTopic case *events.TaskExecAdded: - return "/tasks/exec-added" + return runtime.TaskExecAddedEventTopic case *events.TaskPaused: - return "/tasks/paused" + return runtime.TaskPausedEventTopic case *events.TaskResumed: - return "/tasks/resumed" + return runtime.TaskResumedEventTopic case *events.TaskCheckpointed: - return "/tasks/checkpointed" + return runtime.TaskCheckpointedEventTopic } return "?" } diff --git a/runtime/events.go b/runtime/events.go new file mode 100644 index 000000000..2c7a54174 --- /dev/null +++ b/runtime/events.go @@ -0,0 +1,13 @@ +package runtime + +const ( + TaskCreateEventTopic = "/tasks/create" + TaskStartEventTopic = "/tasks/start" + TaskOOMEventTopic = "/tasks/oom" + TaskExitEventTopic = "/tasks/exit" + TaskDeleteEventTopic = "/tasks/delete" + TaskExecAddedEventTopic = "/tasks/exec-added" + TaskPausedEventTopic = "/tasks/paused" + TaskResumedEventTopic = "/tasks/resumed" + TaskCheckpointedEventTopic = "/tasks/checkpointed" +)