From 8ef2944f1ab6383bb94b3f7c76d5bdace0c4e6d0 Mon Sep 17 00:00:00 2001
From: nadoo <287492+nadoo@users.noreply.github.com>
Date: Wed, 18 Oct 2017 21:47:32 +0800
Subject: [PATCH] log: optimize logs for redir and socks5

---
 redir_linux.go | 12 ++++++------
 socks5.go      | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/redir_linux.go b/redir_linux.go
index 7335218..81fbbcb 100644
--- a/redir_linux.go
+++ b/redir_linux.go
@@ -37,16 +37,16 @@ func NewRedirProxy(addr string, sDialer Dialer) (*RedirProxy, error) {
 func (s *RedirProxy) ListenAndServe() {
 	l, err := net.Listen("tcp", s.addr)
 	if err != nil {
-		logf("failed to listen on %s: %v", s.addr, err)
+		logf("proxy-redir failed to listen on %s: %v", s.addr, err)
 		return
 	}
 
-	logf("listening TCP on %s", s.addr)
+	logf("proxy-redir listening TCP on %s", s.addr)
 
 	for {
 		c, err := l.Accept()
 		if err != nil {
-			logf("failed to accept: %v", err)
+			logf("proxy-redir failed to accept: %v", err)
 			continue
 		}
 
@@ -59,13 +59,13 @@ func (s *RedirProxy) ListenAndServe() {
 
 			tgt, err := getOrigDst(c, false)
 			if err != nil {
-				logf("failed to get target address: %v", err)
+				logf("proxy-redir failed to get target address: %v", err)
 				return
 			}
 
 			rc, err := s.sDialer.Dial("tcp", tgt.String())
 			if err != nil {
-				logf("failed to connect to target: %v", err)
+				logf("proxy-redir failed to connect to target: %v", err)
 				return
 			}
 			defer rc.Close()
@@ -77,7 +77,7 @@ func (s *RedirProxy) ListenAndServe() {
 				if err, ok := err.(net.Error); ok && err.Timeout() {
 					return // ignore i/o timeout
 				}
-				logf("relay error: %v", err)
+				logf("proxy-redir relay error: %v", err)
 			}
 
 		}()
diff --git a/socks5.go b/socks5.go
index 68ebd08..4c6fa03 100644
--- a/socks5.go
+++ b/socks5.go
@@ -81,16 +81,16 @@ func NewSOCKS5(addr, user, pass string, cDialer Dialer, sDialer Dialer) (*SOCKS5
 func (s *SOCKS5) ListenAndServe() {
 	l, err := net.Listen("tcp", s.addr)
 	if err != nil {
-		logf("failed to listen on %s: %v", s.addr, err)
+		logf("proxy-socks5 failed to listen on %s: %v", s.addr, err)
 		return
 	}
 
-	logf("listening TCP on %s", s.addr)
+	logf("proxy-socks5 listening TCP on %s", s.addr)
 
 	for {
 		c, err := l.Accept()
 		if err != nil {
-			logf("failed to accept: %v", err)
+			logf("proxy-socks5 failed to accept: %v", err)
 			continue
 		}
 
@@ -108,13 +108,13 @@ func (s *SOCKS5) Serve(c net.Conn) {
 
 	tgt, err := s.handshake(c)
 	if err != nil {
-		logf("failed to get target address: %v", err)
+		logf("proxy-socks5 failed to get target address: %v", err)
 		return
 	}
 
 	rc, err := s.sDialer.Dial("tcp", tgt.String())
 	if err != nil {
-		logf("failed to connect to target: %v", err)
+		logf("proxy-socks5 failed to connect to target: %v", err)
 		return
 	}
 	defer rc.Close()