Merge pull request #130 from nemith/nemith/channel_close_leak

channel: don't leak go routine on close
scrapli · May 13, 2023 · ec6e666 · ec6e666
2 parents d8f1291 + 10882bf
commit ec6e666
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/channel/channel.go b/channel/channel.go
@@ -65,7 +65,7 @@ func NewChannel(
 		PromptPattern:     getPromptPattern(),
 		ReturnChar:        []byte(DefaultReturnChar),
 
-		done: make(chan bool),
+		done: make(chan struct{}),
 
 		Q:    util.NewQueue(),
 		Errs: make(chan error),
@@ -105,7 +105,7 @@ type Channel struct {
 	PromptPattern     *regexp.Regexp
 	ReturnChar        []byte
 
-	done chan bool
+	done chan struct{}
 
 	Q    *util.Queue
 	Errs chan error
@@ -172,9 +172,9 @@ func (c *Channel) Close() error {
 	ch := make(chan struct{})
 
 	go func() {
-		c.done <- true
+		c.done <- struct{}{}
 
-		ch <- struct{}{}
+		close(ch)
 	}()
 
 	select {