sneak/go-ircevent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Retrieve error chan from method.

Browse Source 
This allows using the error chan in an interface.

Also moved the disconnect error into a named variable for checking specific
errors.
This commit is contained in:
Chance Zibolski 2014-07-14 15:54:53 -07:00
parent a4ab35198c
commit 30980fcbad
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
irc.go
View File

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