From 1c14ece74f6763d5794d1c89cbd18b05bc23bdcc Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 4 Nov 2015 17:37:58 +0300
Subject: [PATCH] Simplify channel closing ordering

---
 client.go | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/client.go b/client.go
index fbaf8a3..c2923d0 100644
--- a/client.go
+++ b/client.go
@@ -46,7 +46,7 @@ type Client struct {
 	away          *string
 	recvTimestamp time.Time
 	sendTimestamp time.Time
-	outBuf        chan string
+	outBuf        chan *string
 	alive         bool
 	sync.Mutex
 }
@@ -76,20 +76,19 @@ func NewClient(conn net.Conn) *Client {
 		recvTimestamp: time.Now(),
 		sendTimestamp: time.Now(),
 		alive:         true,
-		outBuf:        make(chan string, MaxOutBuf),
+		outBuf:        make(chan *string, MaxOutBuf),
 	}
 	go c.MsgSender()
 	return &c
 }
 
 func (c *Client) SetDead() {
-	close(c.outBuf)
+	c.outBuf <- nil
 	c.alive = false
 }
 
 func (c *Client) Close() {
 	c.Lock()
-	c.conn.Close()
 	if c.alive {
 		c.SetDead()
 	}
@@ -133,7 +132,11 @@ func (c *Client) Processor(sink chan ClientEvent) {
 
 func (c *Client) MsgSender() {
 	for msg := range c.outBuf {
-		c.conn.Write(append([]byte(msg), CRLF...))
+		if msg == nil {
+			c.conn.Close()
+			break
+		}
+		c.conn.Write(append([]byte(*msg), CRLF...))
 	}
 }
 
@@ -146,11 +149,12 @@ func (c *Client) Msg(text string) {
 	}
 	if len(c.outBuf) == MaxOutBuf {
 		log.Println(c, "output buffer size exceeded, kicking him")
-		go c.Close()
-		c.SetDead()
+		if c.alive {
+			c.SetDead()
+		}
 		return
 	}
-	c.outBuf <- text
+	c.outBuf <- &text
 }
 
 // Send message from server. It has ": servername" prefix.
-- 
2.44.0