diff --git a/proxy/create_container_interceptor.go b/proxy/create_container_interceptor.go index 14b4e411..e566aacc 100644 --- a/proxy/create_container_interceptor.go +++ b/proxy/create_container_interceptor.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/fsouza/go-dockerclient" - . "github.com/weaveworks/weave/common" + "github.com/weaveworks/weave/common" "github.com/weaveworks/weave/nameserver" ) @@ -47,7 +47,7 @@ func (i *createContainerInterceptor) InterceptRequest(r *http.Request) error { } if cidrs, ok := i.proxy.weaveCIDRsFromConfig(container.Config); ok { - Log.Infof("Creating container with WEAVE_CIDR \"%s\"", strings.Join(cidrs, " ")) + common.Log.Infof("Creating container with WEAVE_CIDR \"%s\"", strings.Join(cidrs, " ")) if container.HostConfig == nil { container.HostConfig = &docker.HostConfig{} } @@ -114,7 +114,7 @@ func (i *createContainerInterceptor) setWeaveDNS(container *createContainerReque // Strip trailing period because it's unusual to see it used on the end of a host name trimmedDNSDomain := strings.TrimSuffix(dnsDomain, ".") if len(name)+1+len(trimmedDNSDomain) > MaxDockerHostname { - Warning.Printf("Container name [%s] too long to be used as hostname", name) + common.Log.Warningf("Container name [%s] too long to be used as hostname", name) } else { container.Hostname = name container.Domainname = trimmedDNSDomain diff --git a/router/local_peer.go b/router/local_peer.go index 395a7a2c..3c9ac880 100644 --- a/router/local_peer.go +++ b/router/local_peer.go @@ -71,7 +71,7 @@ func (peer *LocalPeer) RelayBroadcast(srcPeer *Peer, frame []byte, dec *Ethernet dec) if err != nil { if ftbe, ok := err.(FrameTooBigError); ok { - Log.Warnf("dropping too big DF broadcast frame (%v -> %v): PMTU= %v\n", dec.IP.DstIP, dec.IP.SrcIP, ftbe.EPMTU) + Log.Warningf("dropping too big DF broadcast frame (%v -> %v): PMTU= %v\n", dec.IP.DstIP, dec.IP.SrcIP, ftbe.EPMTU) } else { Log.Errorln(err) }