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

Fix lint error.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2019-01-23 17:23:02 -08:00
parent 879dc6ae25
commit 556b219450
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/server/events.go
View File

@ -112,17 +112,17 @@ func convertEvent(e *gogotypes.Any) (string, interface{}, error) {
return "", nil, errors.Wrap(err, "failed to unmarshalany") return "", nil, errors.Wrap(err, "failed to unmarshalany")
} }
switch evt.(type) { switch e := evt.(type) {
case *eventtypes.TaskExit: case *eventtypes.TaskExit:
id = evt.(*eventtypes.TaskExit).ContainerID id = e.ContainerID
case *eventtypes.TaskOOM: case *eventtypes.TaskOOM:
id = evt.(*eventtypes.TaskOOM).ContainerID id = e.ContainerID
case *eventtypes.ImageCreate: case *eventtypes.ImageCreate:
id = evt.(*eventtypes.ImageCreate).Name id = e.Name
case *eventtypes.ImageUpdate: case *eventtypes.ImageUpdate:
id = evt.(*eventtypes.ImageUpdate).Name id = e.Name
case *eventtypes.ImageDelete: case *eventtypes.ImageDelete:
id = evt.(*eventtypes.ImageDelete).Name id = e.Name
default: default:
return "", nil, errors.New("unsupported event") return "", nil, errors.New("unsupported event")
} }
@ -200,9 +200,8 @@ func (em *eventMonitor) handleEvent(any interface{}) error {
ctx, cancel := context.WithTimeout(ctx, handleEventTimeout) ctx, cancel := context.WithTimeout(ctx, handleEventTimeout)
defer cancel() defer cancel()
switch any.(type) { switch e := any.(type) {
case *eventtypes.TaskExit: case *eventtypes.TaskExit:
e := any.(*eventtypes.TaskExit)
logrus.Infof("TaskExit event %+v", e) logrus.Infof("TaskExit event %+v", e)
// Use ID instead of ContainerID to rule out TaskExit event for exec. // Use ID instead of ContainerID to rule out TaskExit event for exec.
cntr, err := em.c.containerStore.Get(e.ID) cntr, err := em.c.containerStore.Get(e.ID)
@ -226,7 +225,6 @@ func (em *eventMonitor) handleEvent(any interface{}) error {
} }
return nil return nil
case *eventtypes.TaskOOM: case *eventtypes.TaskOOM:
e := any.(*eventtypes.TaskOOM)
logrus.Infof("TaskOOM event %+v", e) logrus.Infof("TaskOOM event %+v", e)
// For TaskOOM, we only care which container it belongs to. // For TaskOOM, we only care which container it belongs to.
cntr, err := em.c.containerStore.Get(e.ContainerID) cntr, err := em.c.containerStore.Get(e.ContainerID)
@ -244,15 +242,12 @@ func (em *eventMonitor) handleEvent(any interface{}) error {
return errors.Wrap(err, "failed to update container status for TaskOOM event") return errors.Wrap(err, "failed to update container status for TaskOOM event")
} }
case *eventtypes.ImageCreate: case *eventtypes.ImageCreate:
e := any.(*eventtypes.ImageCreate)
logrus.Infof("ImageCreate event %+v", e) logrus.Infof("ImageCreate event %+v", e)
return em.c.updateImage(ctx, e.Name) return em.c.updateImage(ctx, e.Name)
case *eventtypes.ImageUpdate: case *eventtypes.ImageUpdate:
e := any.(*eventtypes.ImageUpdate)
logrus.Infof("ImageUpdate event %+v", e) logrus.Infof("ImageUpdate event %+v", e)
return em.c.updateImage(ctx, e.Name) return em.c.updateImage(ctx, e.Name)
case *eventtypes.ImageDelete: case *eventtypes.ImageDelete:
e := any.(*eventtypes.ImageDelete)
logrus.Infof("ImageDelete event %+v", e) logrus.Infof("ImageDelete event %+v", e)
return em.c.updateImage(ctx, e.Name) return em.c.updateImage(ctx, e.Name)
} }

4
pkg/util/strings.go
View File

@ -22,7 +22,7 @@ import "strings"
// Comparison is case insensitive. // Comparison is case insensitive.
func InStringSlice(ss []string, str string) bool { func InStringSlice(ss []string, str string) bool {
for _, s := range ss { for _, s := range ss {
if strings.ToLower(s) == strings.ToLower(str) { if strings.EqualFold(s, str) {
return true return true
} }
} }
@ -34,7 +34,7 @@ func InStringSlice(ss []string, str string) bool {
func SubtractStringSlice(ss []string, str string) []string { func SubtractStringSlice(ss []string, str string) []string {
var res []string var res []string
for _, s := range ss { for _, s := range ss {
if strings.ToLower(s) == strings.ToLower(str) { if strings.EqualFold(s, str) {
continue continue
} }
res = append(res, s) res = append(res, s)