fix: repair bad merge

sethp-nr · sethp-nr · commit 03ee836eea38 · 2020-01-15T09:32:45.000-08:00
Signed-off-by: Seth Pellegrino &lt;spellegrino@newrelic.com&gt;
diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go
@@ -273,7 +273,7 @@ func (s *service) Start(ctx context.Context, r *taskAPI.StartRequest) (*taskAPI.
 	}
 	switch r.ExecID {
 	case "":
-		if err := s.ep.Add(container.ID, cg); err != nil {
+		if err := s.ep.Add(container.ID, container.Cgroup()); err != nil {
 			logrus.WithError(err).Error("add cg to OOM monitor")
 		}
 		s.send(&eventstypes.TaskStart{

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ func (s service) Start(ctx context.Context, r taskAPI.StartRequest) (*taskAPI.`
`273`	`273`	`}`
`274`	`274`	`switch r.ExecID {`
`275`	`275`	`case "":`
`276`		`- if err := s.ep.Add(container.ID, cg); err != nil {`
	`276`	`+ if err := s.ep.Add(container.ID, container.Cgroup()); err != nil {`
`277`	`277`	`logrus.WithError(err).Error("add cg to OOM monitor")`
`278`	`278`	`}`
`279`	`279`	`s.send(&eventstypes.TaskStart{`