aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCecylia Bocovich <cohosh@torproject.org>2021-03-08 21:50:42 -0500
committerCecylia Bocovich <cohosh@torproject.org>2021-03-18 22:05:40 -0400
commit720d2b8eb7be9e2a41126624083054a66017d452 (patch)
tree2a65f0d1d18ebe1460022c48c51be019db069dca
parent850d2f0683ede3d24a2b907161b6d88b32bed24a (diff)
downloadsnowflake-720d2b8eb7be9e2a41126624083054a66017d452.tar.gz
snowflake-720d2b8eb7be9e2a41126624083054a66017d452.zip
Don't log io.ErrClosedPipe in server
These errors are triggered in three places when the OR connection times out. They don't tell us anything useful and are filling up our logs.
-rw-r--r--server/server.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/server/server.go b/server/server.go
index 3b263d0..b3fa04a 100644
--- a/server/server.go
+++ b/server/server.go
@@ -73,7 +73,7 @@ func proxy(local *net.TCPConn, conn net.Conn) {
wg.Add(2)
go func() {
- if _, err := io.Copy(conn, local); err != nil {
+ if _, err := io.Copy(conn, local); err != nil && err != io.ErrClosedPipe {
log.Printf("error copying ORPort to WebSocket %v", err)
}
if err := local.CloseRead(); err != nil {
@@ -83,7 +83,7 @@ func proxy(local *net.TCPConn, conn net.Conn) {
wg.Done()
}()
go func() {
- if _, err := io.Copy(local, conn); err != nil {
+ if _, err := io.Copy(local, conn); err != nil && err != io.ErrClosedPipe {
log.Printf("error copying WebSocket to ORPort %v", err)
}
if err := local.CloseWrite(); err != nil {
@@ -352,7 +352,7 @@ func acceptSessions(ln *kcp.Listener) error {
go func() {
defer conn.Close()
err := acceptStreams(conn)
- if err != nil {
+ if err != nil && err != io.ErrClosedPipe {
log.Printf("acceptStreams: %v", err)
}
}()