From f7f7f7a99b7e60157dae5146b18d900102584198 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Tue, 9 Feb 2016 14:57:20 -0800 Subject: [PATCH] fix missing event on rescheduling Signed-off-by: Victor Vieux --- cluster/engine.go | 2 +- cluster/watchdog.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/engine.go b/cluster/engine.go index c49be1f08a..20e5332707 100644 --- a/cluster/engine.go +++ b/cluster/engine.go @@ -160,7 +160,7 @@ func (e *Engine) StartMonitorEvents() { e.client.StartMonitorEvents(e.handler, ec) go func() { - if err := <-ec; err != nil && err.Error() != "EOF" { + if err := <-ec; err != nil && !strings.Contains(err.Error(), "EOF") { log.WithFields(log.Fields{"name": e.Name, "id": e.ID}).Errorf("Error monitoring events: %s", err) } else if err != nil { log.WithFields(log.Fields{"name": e.Name, "id": e.ID}).Debug("EOF monitoring events, restarting") diff --git a/cluster/watchdog.go b/cluster/watchdog.go index 0f360bff71..25efd7b3df 100644 --- a/cluster/watchdog.go +++ b/cluster/watchdog.go @@ -45,7 +45,7 @@ func (w *Watchdog) removeDuplicateContainers(e *Engine) { for _, containerInCluster := range w.cluster.Containers() { if containerInCluster.Config.SwarmID() == container.Config.SwarmID() && containerInCluster.Engine.ID != container.Engine.ID { - log.Debugf("container %s was rescheduled on node %s, removing it\n", container.Id, containerInCluster.Engine.ID) + log.Debugf("container %s was rescheduled on node %s, removing it", container.Id, containerInCluster.Engine.ID) // container already exists in the cluster, destroy it e.RemoveContainer(container, true, true) }