From 2389eb18dd4955d317b44e48c83aa04fa0ee8c75 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <hi@nhooyr.io>
Date: Fri, 26 Apr 2019 23:03:13 -0400
Subject: [PATCH] Fix CI
---
bench_test.go | 2 +-
websocket.go | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bench_test.go b/bench_test.go
index a97341c..6efbf48 100644
--- a/bench_test.go
+++ b/bench_test.go
@@ -99,6 +99,6 @@ func benchConn(b *testing.B, stream bool) {
}
func BenchmarkConn(b *testing.B) {
- benchConn(b, true)
benchConn(b, false)
+ benchConn(b, true)
}
diff --git a/websocket.go b/websocket.go
index c5e3bf5..8688509 100644
--- a/websocket.go
+++ b/websocket.go
@@ -460,7 +460,7 @@ type messageWriter struct {
// Write writes the given bytes to the WebSocket connection.
func (w messageWriter) Write(p []byte) (int, error) {
- n, err := w.Write(p)
+ n, err := w.write(p)
if err != nil {
return n, xerrors.Errorf("failed to write: %w", err)
}
@@ -522,14 +522,14 @@ func (w messageWriter) close() error {
// You can only read a single message at a time so do not call this method
// concurrently.
func (c *Conn) Reader(ctx context.Context) (MessageType, io.Reader, error) {
- typ, r, err := c.Reader(ctx)
+ typ, r, err := c.reader(ctx)
if err != nil {
return 0, nil, xerrors.Errorf("failed to get reader: %w", err)
}
return typ, r, nil
}
-func (c *Conn) reader(ctx context.Context) (MessageType, io.Reader, error) {
+func (c *Conn) reader(ctx context.Context) (MessageType, io.Reader, error) {
for !atomic.CompareAndSwapInt64(&c.activeReader, 0, 1) {
select {
case <-c.closed:
--
GitLab