Remove noisy printf in NextReader()

Brendan Creane · AlexVulaj · commit dcea2f088ce1 · 2023-12-10T23:08:54.000-05:00
diff --git a/compression.go b/compression.go
@@ -8,7 +8,6 @@ import (
 	"compress/flate"
 	"errors"
 	"io"
-	"log"
 	"strings"
 	"sync"
 )
@@ -135,9 +134,7 @@ func (r *flateReadWrapper) Read(p []byte) (int, error) {
 		// Preemptively place the reader back in the pool. This helps with
 		// scenarios where the application does not call NextReader() soon after
 		// this final read.
-		if err := r.Close(); err != nil {
-			log.Printf("websocket: flateReadWrapper.Close() returned error: %v", err)
-		}
+		_ = r.Close()
 	}
 	return n, err
 }
diff --git a/conn.go b/conn.go
@@ -10,7 +10,6 @@ import (
 	"encoding/binary"
 	"errors"
 	"io"
-	"log"
 	"net"
 	"strconv"
 	"strings"
@@ -490,9 +489,7 @@ func (c *Conn) beginMessage(mw *messageWriter, messageType int) error {
 	// probably better to return an error in this situation, but we cannot
 	// change this without breaking existing applications.
 	if c.writer != nil {
-		if err := c.writer.Close(); err != nil {
-			log.Printf("websocket: discarding writer close error: %v", err)
-		}
+		_ = c.writer.Close()
 		c.writer = nil
 	}
 
@@ -1021,9 +1018,7 @@ func (c *Conn) handleProtocolError(message string) error {
 func (c *Conn) NextReader() (messageType int, r io.Reader, err error) {
 	// Close previous reader, only relevant for decompression.
 	if c.reader != nil {
-		if err := c.reader.Close(); err != nil {
-			log.Printf("websocket: discarding reader close error: %v", err)
-		}
+		_ = c.reader.Close()
 		c.reader = nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"compress/flate"`
`9`	`9`	`"errors"`
`10`	`10`	`"io"`
`11`		`- "log"`
`12`	`11`	`"strings"`
`13`	`12`	`"sync"`
`14`	`13`	`)`
`@@ -135,9 +134,7 @@ func (r *flateReadWrapper) Read(p []byte) (int, error) {`
`135`	`134`	`// Preemptively place the reader back in the pool. This helps with`
`136`	`135`	`// scenarios where the application does not call NextReader() soon after`
`137`	`136`	`// this final read.`
`138`		`- if err := r.Close(); err != nil {`
`139`		`- log.Printf("websocket: flateReadWrapper.Close() returned error: %v", err)`
`140`		`- }`
	`137`	`+ _ = r.Close()`
`141`	`138`	`}`
`142`	`139`	`return n, err`
`143`	`140`	`}`