stream copy print high-level error

xtaci · Sep 22, 2019 · ade7ee0 · ade7ee0
1 parent 30cca4d
commit ade7ee0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/client/main.go b/client/main.go
@@ -58,7 +58,20 @@ func handleClient(mux generic.Mux, p1 net.Conn, quiet bool) {
 		die := make(chan struct{})
 		go func() {
 			buf := xmitBuf.Get().([]byte)
-			generic.CopyBuffer(dst, src, buf)
+			if _, err := generic.CopyBuffer(dst, src, buf); err != nil {
+				// error handling
+				cause := err
+				if e, ok := err.(interface{ Cause() error }); ok {
+					cause = e.Cause()
+				}
+
+				switch cause {
+				case io.EOF:
+				case io.ErrClosedPipe:
+				default:
+					log.Println(err)
+				}
+			}
 			xmitBuf.Put(buf)
 			close(die)
 		}()

diff --git a/server/main.go b/server/main.go
@@ -121,7 +121,20 @@ func handleClient(p1 io.ReadWriteCloser, p2 net.Conn, quiet bool) {
 		die := make(chan struct{})
 		go func() {
 			buf := xmitBuf.Get().([]byte)
-			generic.CopyBuffer(dst, src, buf)
+			if _, err := generic.CopyBuffer(dst, src, buf); err != nil {
+				// error handling
+				cause := err
+				if e, ok := err.(interface{ Cause() error }); ok {
+					cause = e.Cause()
+				}
+
+				switch cause {
+				case io.EOF:
+				case io.ErrClosedPipe:
+				default:
+					log.Println(err)
+				}
+			}
 			xmitBuf.Put(buf)
 			close(die)
 		}()