Merge pull request #203 from jehiah/snappy_switch_203

switch to golang/snappy
nsqio · Dec 29, 2016 · a53d495 · a53d495
2 parents 6865cb8 + 15f6305
commit a53d495
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ env:
   - NSQ_DOWNLOAD=nsq-0.3.8.linux-amd64.go1.6.2 GOARCH=amd64
   - NSQ_DOWNLOAD=nsq-0.3.8.linux-amd64.go1.6.2 GOARCH=386
 install:
-  - go get github.com/mreiferson/go-snappystream
+  - go get github.com/golang/snappy
 script:
   - wget http://bitly-downloads.s3.amazonaws.com/nsq/$NSQ_DOWNLOAD.tar.gz
   - tar zxvf $NSQ_DOWNLOAD.tar.gz

diff --git a/conn.go b/conn.go
@@ -15,7 +15,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mreiferson/go-snappystream"
+	"github.com/golang/snappy"
 )
 
 // IdentifyResponse represents the metadata
@@ -427,8 +427,8 @@ func (c *Conn) upgradeSnappy() error {
 	if c.tlsConn != nil {
 		conn = c.tlsConn
 	}
-	c.r = snappystream.NewReader(conn, snappystream.SkipVerifyChecksum)
-	c.w = snappystream.NewWriter(conn)
+	c.r = snappy.NewReader(conn)
+	c.w = snappy.NewWriter(conn)
 	frameType, data, err := ReadUnpackedResponse(c)
 	if err != nil {
 		return err