diff --git a/cmd/ctr/events.go b/cmd/ctr/events.go index 14a99a6a8..b75dedbc0 100644 --- a/cmd/ctr/events.go +++ b/cmd/ctr/events.go @@ -77,25 +77,25 @@ func getEventOutput(evt *event.Envelope) (string, error) { if err := proto.Unmarshal(evt.Event.Value, e); err != nil { return out, err } - out = fmt.Sprintf("id=%s", e.ContainerID) + out = "id=" + e.ContainerID case "types.containerd.io/containerd.v1.types.event.TaskDelete": e := &event.TaskDelete{} if err := proto.Unmarshal(evt.Event.Value, e); err != nil { return out, err } - out = fmt.Sprintf("id=%s", e.ContainerID) + out = "id=" + e.ContainerID case "types.containerd.io/containerd.v1.types.event.ContainerUpdate": e := &event.ContainerUpdate{} if err := proto.Unmarshal(evt.Event.Value, e); err != nil { return out, err } - out = fmt.Sprintf("id=%s", e.ContainerID) + out = "id=" + e.ContainerID case "types.containerd.io/containerd.v1.types.event.ContainerDelete": e := &event.ContainerDelete{} if err := proto.Unmarshal(evt.Event.Value, e); err != nil { return out, err } - out = fmt.Sprintf("id=%s", e.ContainerID) + out = "id=" + e.ContainerID case "types.containerd.io/containerd.v1.types.event.SnapshotPrepare": e := &event.SnapshotPrepare{} if err := proto.Unmarshal(evt.Event.Value, e); err != nil { @@ -113,7 +113,7 @@ func getEventOutput(evt *event.Envelope) (string, error) { if err := proto.Unmarshal(evt.Event.Value, e); err != nil { return out, err } - out = fmt.Sprintf("key=%s", e.Key) + out = "key=" + e.Key case "types.containerd.io/containerd.v1.types.event.ImagePut": e := &event.ImagePut{} if err := proto.Unmarshal(evt.Event.Value, e); err != nil { @@ -125,7 +125,7 @@ func getEventOutput(evt *event.Envelope) (string, error) { if err := proto.Unmarshal(evt.Event.Value, e); err != nil { return out, err } - out = fmt.Sprintf("name=%s", e.Name) + out = "name=" + e.Name case "types.containerd.io/containerd.v1.types.event.NamespaceCreate": e := &event.NamespaceCreate{} if err := proto.Unmarshal(evt.Event.Value, e); err != nil { @@ -143,7 +143,7 @@ func getEventOutput(evt *event.Envelope) (string, error) { if err := proto.Unmarshal(evt.Event.Value, e); err != nil { return out, err } - out = fmt.Sprintf("name=%s", e.Name) + out = "name=" + e.Name case "types.containerd.io/containerd.v1.types.event.RuntimeCreate": e := &event.RuntimeCreate{} if err := proto.Unmarshal(evt.Event.Value, e); err != nil { diff --git a/events/emitter.go b/events/emitter.go index 75cdc51ba..a6bbed1ab 100644 --- a/events/emitter.go +++ b/events/emitter.go @@ -63,7 +63,3 @@ func (e *Emitter) Remove(clientID string) { } e.m.Unlock() } - -func (e *Emitter) Close() error { - return e.broadcaster.Close() -} diff --git a/events/sink.go b/events/sink.go index a096db10d..9ae5912be 100644 --- a/events/sink.go +++ b/events/sink.go @@ -54,6 +54,5 @@ func (s *eventSink) Write(evt goevents.Event) error { } func (s *eventSink) Close() error { - close(s.ch) return nil } diff --git a/services/events/service.go b/services/events/service.go index e9622cae5..5f155166e 100644 --- a/services/events/service.go +++ b/services/events/service.go @@ -16,7 +16,6 @@ func init() { Type: plugin.GRPCPlugin, ID: "events", Init: func(ic *plugin.InitContext) (interface{}, error) { - logrus.Debug(ic.Emitter) return NewService(ic.Emitter), nil }, })