Don't send exit event on failure
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
parent
17e4d62ab0
commit
94568b7a9b
2 changed files with 15 additions and 11 deletions
|
@ -9,9 +9,10 @@ import (
|
|||
|
||||
type DeleteTask struct {
|
||||
baseTask
|
||||
ID string
|
||||
Status int
|
||||
PID string
|
||||
ID string
|
||||
Status int
|
||||
PID string
|
||||
NoEvent bool
|
||||
}
|
||||
|
||||
func (s *Supervisor) delete(t *DeleteTask) error {
|
||||
|
@ -20,13 +21,15 @@ func (s *Supervisor) delete(t *DeleteTask) error {
|
|||
if err := s.deleteContainer(i.container); err != nil {
|
||||
logrus.WithField("error", err).Error("containerd: deleting container")
|
||||
}
|
||||
s.notifySubscribers(Event{
|
||||
Type: "exit",
|
||||
Timestamp: time.Now(),
|
||||
ID: t.ID,
|
||||
Status: t.Status,
|
||||
PID: t.PID,
|
||||
})
|
||||
if !t.NoEvent {
|
||||
s.notifySubscribers(Event{
|
||||
Type: "exit",
|
||||
Timestamp: time.Now(),
|
||||
ID: t.ID,
|
||||
Status: t.Status,
|
||||
PID: t.PID,
|
||||
})
|
||||
}
|
||||
ContainersCounter.Dec(1)
|
||||
ContainerDeleteTimer.UpdateSince(start)
|
||||
}
|
||||
|
|
|
@ -46,7 +46,8 @@ func (w *worker) Start() {
|
|||
}).Error("containerd: start container")
|
||||
t.Err <- err
|
||||
evt := &DeleteTask{
|
||||
ID: t.Container.ID(),
|
||||
ID: t.Container.ID(),
|
||||
NoEvent: true,
|
||||
}
|
||||
w.s.SendTask(evt)
|
||||
continue
|
||||
|
|
Loading…
Reference in a new issue