From 8b97f12ab1ab61d2fd9511dcf4220a8606eef9d9 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@weave.works>
Date: Tue, 16 Aug 2016 12:48:26 +0000
Subject: [PATCH] Make stats gathering idempotent

---
 CHANGELOG.md              | 1 +
 probe/docker/container.go | 2 +-
 probe/docker/registry.go  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4af00c800..94180b884 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ New features and enhancements:
 	[#1768](https://github.com/weaveworks/scope/pull/1768)	
 - Eliminate stats log noise from stopped containers
 	[#1687](https://github.com/weaveworks/scope/pull/1687)
+	[#1798](https://github.com/weaveworks/scope/pull/1798)	
 - Hide uncontained/unmanaged by default
 	[#1694](https://github.com/weaveworks/scope/pull/1694)
 
diff --git a/probe/docker/container.go b/probe/docker/container.go
index c88288d7d..7f956a836 100644
--- a/probe/docker/container.go
+++ b/probe/docker/container.go
@@ -181,7 +181,7 @@ func (c *container) StartGatheringStats() error {
 	defer c.Unlock()
 
 	if c.statsConn != nil {
-		return fmt.Errorf("already gather stats for container %s", c.container.ID)
+		return nil
 	}
 
 	go func() {
diff --git a/probe/docker/registry.go b/probe/docker/registry.go
index a3afc9500..1a8c4c71c 100644
--- a/probe/docker/registry.go
+++ b/probe/docker/registry.go
@@ -360,7 +360,7 @@ func (r *registry) updateContainerState(containerID string, intendedState *strin
 	if r.collectStats {
 		if dockerContainer.State.Running {
 			if err := c.StartGatheringStats(); err != nil {
-				log.Errorf("Error gather stats for container: %s", containerID)
+				log.Errorf("Error gathering stats for container %s: %s", containerID, err)
 				return
 			}
 		} else {