Merge branch 'master' of https://github.com/nsqio/go-nsq into channel…

…_stats_command

api_request.go

@@ -3,7 +3,7 @@ package nsq
 import (
  "encoding/json"
  "fmt"
- "io/ioutil"
+ "io"
  "net"
  "net/http"
  "time"
@@ -47,7 +47,7 @@ func apiRequestNegotiateV1(httpclient *http.Client, method string, endpoint stri
  return err
  }
 
- respBody, err := ioutil.ReadAll(resp.Body)
+ respBody, err := io.ReadAll(resp.Body)
  resp.Body.Close()
  if err != nil {
  return err

config.go

@@ -5,7 +5,6 @@ import (
  "crypto/x509"
  "errors"
  "fmt"
- "io/ioutil"
  "log"
  "math"
  "math/rand"
@@ -434,7 +433,7 @@ func (t *tlsConfig) Set(c *Config, option string, value interface{}) error {
  return fmt.Errorf("ERROR: %v is not a string", value)
  }
  tlsCertPool := x509.NewCertPool()
- caCertFile, err := ioutil.ReadFile(filename)
+ caCertFile, err := os.ReadFile(filename)
  if err != nil {
  return fmt.Errorf("ERROR: failed to read custom Certificate Authority file %s", err)
  }

conn.go

@@ -471,7 +471,7 @@ func (c *Conn) upgradeSnappy() error {
  conn = c.tlsConn
  }
  c.r = snappy.NewReader(conn)
- c.w = snappy.NewWriter(conn)
+ c.w = snappy.NewBufferedWriter(conn)
  frameType, data, err := ReadUnpackedResponse(c, c.config.MaxMsgSize)
  if err != nil {
  return err

mock_test.go

@@ -184,7 +184,7 @@ func framedResponse(frameType int32, data []byte) []byte {
  return nil
  }
 
- _, err = w.Write(data)
+ _, _ = w.Write(data)
  return w.Bytes()
 }
 

producer_test.go

@@ -3,7 +3,7 @@ package nsq
 import (
  "bytes"
  "errors"
- "io/ioutil"
+ "io"
  "log"
  "net"
  "os"
@@ -63,7 +63,7 @@ func TestProducerConnection(t *testing.T) {
 }
 
 func TestProducerPing(t *testing.T) {
- log.SetOutput(ioutil.Discard)
+ log.SetOutput(io.Discard)
  defer log.SetOutput(os.Stdout)
 
  config := NewConfig()