From 30980fcbaddeab5a109880e82b47158e8722e621 Mon Sep 17 00:00:00 2001
From: Chance Zibolski <chance.zibolski@gmail.com>
Date: Mon, 14 Jul 2014 15:54:53 -0700
Subject: [PATCH] Retrieve error chan from method.

This allows using the error chan in an interface.

Also moved the disconnect error into a named variable for checking specific
errors.
---
 irc.go | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/irc.go b/irc.go
index 1fc06fa..84cb6f0 100644
--- a/irc.go
+++ b/irc.go
@@ -35,11 +35,15 @@ const (
 	VERSION = "go-ircevent v2.1"
 )
 
+var ErrDisconnected = errors.New("Disconnect Called")
+
 // Read data from a connection. To be used as a goroutine.
 func (irc *Connection) readLoop() {
 	defer irc.Done()
 	br := bufio.NewReaderSize(irc.socket, 512)
 
+	errChan := irc.ErrorChan()
+
 	for {
 		select {
 		case <-irc.end:
@@ -61,7 +65,7 @@ func (irc *Connection) readLoop() {
 			}
 
 			if err != nil {
-				irc.Error <- err
+				errChan <- err
 				break
 			}
 
@@ -103,6 +107,7 @@ func (irc *Connection) readLoop() {
 // Loop to write to a connection. To be used as a goroutine.
 func (irc *Connection) writeLoop() {
 	defer irc.Done()
+	errChan := irc.ErrorChan()
 	for {
 		select {
 		case <-irc.end:
@@ -127,7 +132,7 @@ func (irc *Connection) writeLoop() {
 			irc.socket.SetWriteDeadline(zero)
 
 			if err != nil {
-				irc.Error <- err
+				errChan <- err
 				return
 			}
 		}
@@ -166,8 +171,9 @@ func (irc *Connection) pingLoop() {
 
 // Main loop to control the connection.
 func (irc *Connection) Loop() {
+	errChan := irc.ErrorChan()
 	for !irc.stopped {
-		err := <-irc.Error
+		err := <-errChan
 		if irc.stopped {
 			break
 		}
@@ -276,6 +282,10 @@ func (irc *Connection) Mode(target string, modestring ...string) {
 	irc.SendRawf("MODE %s", target)
 }
 
+func (irc *Connection) ErrorChan() chan error {
+	return irc.Error
+}
+
 // A disconnect sends all buffered messages (if possible),
 // stops all goroutines and then closes the socket.
 func (irc *Connection) Disconnect() {
@@ -290,7 +300,7 @@ func (irc *Connection) Disconnect() {
 		irc.netsock.Close()
 		irc.netsock = nil
 	}
-	irc.Error <- errors.New("Disconnect Called")
+	irc.ErrorChan() <- ErrDisconnected
 }
 
 // Reconnect to a server using the current connection.