From 65356ed861e5bf42449d09eb09df335ddb0afdb4 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 19 Oct 2016 00:01:11 +0100 Subject: [PATCH] Do not use logrus for proxy This simplifies how we build it in docker/docker as no vendoring needed, and this does program not use any logrus features. Signed-off-by: Justin Cormack --- libnetwork/cmd/proxy/tcp_proxy.go | 7 +++---- libnetwork/cmd/proxy/udp_proxy.go | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/libnetwork/cmd/proxy/tcp_proxy.go b/libnetwork/cmd/proxy/tcp_proxy.go index 514b778773..1c713105db 100644 --- a/libnetwork/cmd/proxy/tcp_proxy.go +++ b/libnetwork/cmd/proxy/tcp_proxy.go @@ -2,11 +2,10 @@ package main import ( "io" + "log" "net" "sync" "syscall" - - "github.com/Sirupsen/logrus" ) // TCPProxy is a proxy for TCP connections. It implements the Proxy interface to @@ -35,7 +34,7 @@ func NewTCPProxy(frontendAddr, backendAddr *net.TCPAddr) (*TCPProxy, error) { func (proxy *TCPProxy) clientLoop(client *net.TCPConn, quit chan bool) { backend, err := net.DialTCP("tcp", nil, proxy.backendAddr) if err != nil { - logrus.Printf("Can't forward traffic to backend tcp/%v: %s\n", proxy.backendAddr, err) + log.Printf("Can't forward traffic to backend tcp/%v: %s\n", proxy.backendAddr, err) client.Close() return } @@ -79,7 +78,7 @@ func (proxy *TCPProxy) Run() { for { client, err := proxy.listener.Accept() if err != nil { - logrus.Printf("Stopping proxy on tcp/%v for tcp/%v (%s)", proxy.frontendAddr, proxy.backendAddr, err) + log.Printf("Stopping proxy on tcp/%v for tcp/%v (%s)", proxy.frontendAddr, proxy.backendAddr, err) return } go proxy.clientLoop(client.(*net.TCPConn), quit) diff --git a/libnetwork/cmd/proxy/udp_proxy.go b/libnetwork/cmd/proxy/udp_proxy.go index 2b895ae9d4..12b96db646 100644 --- a/libnetwork/cmd/proxy/udp_proxy.go +++ b/libnetwork/cmd/proxy/udp_proxy.go @@ -2,13 +2,12 @@ package main import ( "encoding/binary" + "log" "net" "strings" "sync" "syscall" "time" - - "github.com/Sirupsen/logrus" ) const ( @@ -112,7 +111,7 @@ func (proxy *UDPProxy) Run() { // ECONNREFUSED like Read do (see comment in // UDPProxy.replyLoop) if !isClosedError(err) { - logrus.Printf("Stopping proxy on udp/%v for udp/%v (%s)", proxy.frontendAddr, proxy.backendAddr, err) + log.Printf("Stopping proxy on udp/%v for udp/%v (%s)", proxy.frontendAddr, proxy.backendAddr, err) } break } @@ -123,7 +122,7 @@ func (proxy *UDPProxy) Run() { if !hit { proxyConn, err = net.DialUDP("udp", nil, proxy.backendAddr) if err != nil { - logrus.Printf("Can't proxy a datagram to udp/%s: %s\n", proxy.backendAddr, err) + log.Printf("Can't proxy a datagram to udp/%s: %s\n", proxy.backendAddr, err) proxy.connTrackLock.Unlock() continue } @@ -134,7 +133,7 @@ func (proxy *UDPProxy) Run() { for i := 0; i != read; { written, err := proxyConn.Write(readBuf[i:read]) if err != nil { - logrus.Printf("Can't proxy a datagram to udp/%s: %s\n", proxy.backendAddr, err) + log.Printf("Can't proxy a datagram to udp/%s: %s\n", proxy.backendAddr, err) break } i += written