From 357f67255e4f6e18129f68317e9f3a50b02ca2bd Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 15 Dec 2015 17:25:31 +0000
Subject: [PATCH] Move logging of Docker API info to callers

---
 common/docker/client.go | 17 +++++++++++------
 prog/plugin/main.go     |  2 ++
 prog/weaver/main.go     |  2 ++
 proxy/proxy.go          |  2 ++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/common/docker/client.go b/common/docker/client.go
index d2b5dab0..86cb9dd7 100644
--- a/common/docker/client.go
+++ b/common/docker/client.go
@@ -2,9 +2,10 @@ package docker
 
 import (
 	"errors"
+	"fmt"
 	"strings"
 
-	"github.com/fsouza/go-dockerclient"
+	docker "github.com/fsouza/go-dockerclient"
 
 	. "github.com/weaveworks/weave/common"
 )
@@ -57,12 +58,16 @@ func NewVersionedClientFromEnv(apiVersionString string) (*Client, error) {
 }
 
 func (c *Client) checkWorking() error {
-	env, err := c.Version()
-	if err != nil {
-		return err
+	_, err := c.Version()
+	return err
+}
+
+func (c *Client) Info() string {
+	if env, err := c.Version(); err != nil {
+		return fmt.Sprintf("Docker API error: %s", err)
+	} else {
+		return fmt.Sprintf("Docker API on %s: %v", c.Endpoint(), env)
 	}
-	Log.Infof("[docker] Using Docker API on %s: %v", c.Endpoint(), env)
-	return nil
 }
 
 // AddObserver adds an observer for docker events
diff --git a/prog/plugin/main.go b/prog/plugin/main.go
index d1ffb928..ff324338 100644
--- a/prog/plugin/main.go
+++ b/prog/plugin/main.go
@@ -54,6 +54,8 @@ func main() {
 	dockerClient, err := docker.NewVersionedClientFromEnv("1.21")
 	if err != nil {
 		Log.Fatalf("unable to connect to docker: %s", err)
+	} else {
+		Log.Info(dockerClient.Info())
 	}
 
 	var globalListener, meshListener net.Listener
diff --git a/prog/weaver/main.go b/prog/weaver/main.go
index a4ff46e8..ba09998a 100644
--- a/prog/weaver/main.go
+++ b/prog/weaver/main.go
@@ -255,6 +255,8 @@ func main() {
 		dc, err := docker.NewClient(dockerAPI)
 		if err != nil {
 			Log.Fatal("Unable to start docker client: ", err)
+		} else {
+			Log.Info(dc.Info())
 		}
 		dockerCli = dc
 	}
diff --git a/proxy/proxy.go b/proxy/proxy.go
index 3fcd983f..9dfb7972 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -94,6 +94,8 @@ func NewProxy(c Config) (*Proxy, error) {
 	client, err := weavedocker.NewVersionedClient(c.DockerHost, "1.18")
 	if err != nil {
 		return nil, err
+	} else {
+		Log.Info(client.Info())
 	}
 	p.client = client.Client