From 31f26fed18cd9229f44f6d8dac374a9ca864beaa Mon Sep 17 00:00:00 2001
From: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Date: Mon, 6 Feb 2017 08:46:37 -0800
Subject: [PATCH] Move to a single Event type

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
---
 cmd/ctr/run.go      |  8 ++++----
 execution/events.go | 22 +++++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/cmd/ctr/run.go b/cmd/ctr/run.go
index afdcfb3..fbd9ed3 100644
--- a/cmd/ctr/run.go
+++ b/cmd/ctr/run.go
@@ -50,8 +50,8 @@ var runCommand = cli.Command{
 		}
 		defer nec.Close()
 
-		evCh := make(chan *execEvents.ContainerExitEvent, 64)
-		sub, err := nec.Subscribe(execEvents.ContainersEventsSubjectSubscriber, func(e *execEvents.ContainerExitEvent) {
+		evCh := make(chan *execEvents.ContainerEvent, 64)
+		sub, err := nec.Subscribe(execEvents.ContainersEventsSubjectSubscriber, func(e *execEvents.ContainerEvent) {
 			evCh <- e
 		})
 		if err != nil {
@@ -118,8 +118,8 @@ var runCommand = cli.Command{
 					break eventLoop
 				}
 
-				if e.ID == cr.Container.ID && e.PID == cr.InitProcess.Pid {
-					ec = e.StatusCode
+				if e.ID == cr.Container.ID && e.Pid == cr.InitProcess.Pid {
+					ec = e.ExitStatus
 					break eventLoop
 				}
 			case <-time.After(1 * time.Second):
diff --git a/execution/events.go b/execution/events.go
index 82f777d..896b1c7 100644
--- a/execution/events.go
+++ b/execution/events.go
@@ -2,16 +2,20 @@ package execution
 
 import "time"
 
-type ContainerEvent struct {
-	Timestamp time.Time
-	ID        string
-	Action    string
-}
+const (
+	ExitEvent   = "exit"
+	OOMEvent    = "oom"
+	CreateEvent = "create"
+	StartEvent  = "start"
+	ExecEvent   = "exec-added9"
+)
 
-type ContainerExitEvent struct {
-	ContainerEvent
-	PID        uint32
-	StatusCode uint32
+type ContainerEvent struct {
+	Timestamp  time.Time
+	ID         string
+	Type       string
+	Pid        uint32
+	ExitStatus uint32
 }
 
 const (