bugfix: <-timer.C after Stop will hang if timer.C is empty (#66)

lrstanley · Mar 17, 2024 · a4a3d96 · a4a3d96
1 parent 6cf311a
commit a4a3d96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/client.go b/client.go
@@ -312,11 +312,7 @@ func New(config Config) *Client {
 // the event can't be sent within 30s.
 func (c *Client) receive(e *Event) {
 	t := time.NewTimer(30 * time.Second)
-	defer func() {
-		if !t.Stop() {
-			<-t.C
-		}
-	}()
+	defer t.Stop()
 
 	select {
 	case c.rx <- e:

diff --git a/conn.go b/conn.go
@@ -486,11 +486,7 @@ func (c *Client) write(event *Event) {
 	}
 
 	t := time.NewTimer(30 * time.Second)
-	defer func() {
-		if !t.Stop() {
-			<-t.C
-		}
-	}()
+	defer t.Stop()
 
 	select {
 	case c.tx <- event: