From f7f0369bff3ff0ba67288deb482ced2a12bf8909 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Tue, 19 May 2015 19:46:53 +0100
Subject: [PATCH] improve logging in proxy

- always info-log when we encounter an 'interesting' container
- s/CIDR/WEAVE_CIDR
- some other minor tweaks
---
 proxy/create_container_interceptor.go | 5 ++++-
 proxy/create_exec_interceptor.go      | 5 ++++-
 proxy/start_container_interceptor.go  | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/proxy/create_container_interceptor.go b/proxy/create_container_interceptor.go
index 20f978ae..64c97520 100644
--- a/proxy/create_container_interceptor.go
+++ b/proxy/create_container_interceptor.go
@@ -5,8 +5,10 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"strings"
 
 	"github.com/fsouza/go-dockerclient"
+	. "github.com/weaveworks/weave/common"
 )
 
 type createContainerInterceptor struct {
@@ -33,7 +35,8 @@ func (i *createContainerInterceptor) InterceptRequest(r *http.Request) error {
 		return err
 	}
 
-	if _, ok := weaveCIDRsFromConfig(container.Config); ok {
+	if cidrs, ok := weaveCIDRsFromConfig(container.Config); ok {
+		Info.Printf("Creating container with WEAVE_CIDR \"%s\"", strings.Join(cidrs, " "))
 		container.HostConfig.VolumesFrom = append(container.HostConfig.VolumesFrom, "weaveproxy")
 		if err := i.setWeaveWaitEntrypoint(container.Config); err != nil {
 			return err
diff --git a/proxy/create_exec_interceptor.go b/proxy/create_exec_interceptor.go
index aba8f138..00050115 100644
--- a/proxy/create_exec_interceptor.go
+++ b/proxy/create_exec_interceptor.go
@@ -4,8 +4,10 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"strings"
 
 	"github.com/fsouza/go-dockerclient"
+	. "github.com/weaveworks/weave/common"
 )
 
 type createExecInterceptor struct {
@@ -35,7 +37,8 @@ func (i *createExecInterceptor) InterceptRequest(r *http.Request) error {
 		return err
 	}
 
-	if _, ok := weaveCIDRsFromConfig(container.Config); ok {
+	if cidrs, ok := weaveCIDRsFromConfig(container.Config); ok {
+		Info.Printf("Exec in container %s with WEAVE_CIDR \"%s\"", container.ID, strings.Join(cidrs, " "))
 		options.Cmd = append(weaveWaitEntrypoint, options.Cmd...)
 	}
 
diff --git a/proxy/start_container_interceptor.go b/proxy/start_container_interceptor.go
index 82cefd23..d35c3afd 100644
--- a/proxy/start_container_interceptor.go
+++ b/proxy/start_container_interceptor.go
@@ -28,12 +28,12 @@ func (i *startContainerInterceptor) InterceptResponse(r *http.Response) error {
 		Debug.Print("No Weave CIDR, ignoring")
 		return nil
 	}
-	Info.Printf("Container %s was started with CIDR \"%s\"", container.ID, strings.Join(cidrs, " "))
+	Info.Printf("Attaching container %s with WEAVE_CIDR \"%s\" to weave network", container.ID, strings.Join(cidrs, " "))
 	args := []string{"attach"}
 	args = append(args, cidrs...)
 	args = append(args, container.ID)
 	if _, err := callWeave(args...); err != nil {
-		Warning.Printf("Attaching container %s to weave failed: %v", container.ID, err)
+		Warning.Printf("Attaching container %s to weave network failed: %v", container.ID, err)
 		return nil
 	}
 	return nil