docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1786 from vieux/fix_missing_event_rescheduling 

fix missing event on rescheduling
This commit is contained in:
Alexandre Beslic 2016-02-09 15:33:42 -08:00
parent 4864b775cb f7f7f7a99b
commit af74afabbc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/engine.go
View File

@ -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")

2
cluster/watchdog.go
View File

@ -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)
}