fix snappy not close connection, fix #456, fix #584, fix #600

This commit is contained in:
ffdfgdfg 2020-10-06 00:28:33 +08:00
parent d7de698fc8
commit 5224307da7

View File

@ -1,6 +1,7 @@
package conn
import (
"errors"
"io"
"github.com/golang/snappy"
@ -9,12 +10,14 @@ import (
type SnappyConn struct {
w *snappy.Writer
r *snappy.Reader
c io.Closer
}
func NewSnappyConn(conn io.ReadWriteCloser) *SnappyConn {
c := new(SnappyConn)
c.w = snappy.NewBufferedWriter(conn)
c.r = snappy.NewReader(conn)
c.c = conn.(io.Closer)
return c
}
@ -35,6 +38,16 @@ func (s *SnappyConn) Read(b []byte) (n int, err error) {
}
func (s *SnappyConn) Close() error {
s.w.Close()
return s.w.Close()
err := s.w.Close()
err2 := s.c.Close()
if err != nil && err2 == nil {
return err
}
if err == nil && err2 != nil {
return err2
}
if err != nil && err2 != nil {
return errors.New(err.Error() + err2.Error())
}
return nil
}