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

fixing reconnect

Browse Source
This commit is contained in:
soda 2014-06-21 16:30:15 +02:00
parent b73cc42bde
commit 809b9be4e4
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
irc.go
View File

@ -102,13 +102,16 @@ 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() {
irc.Log.Printf("writeLoop() created")
defer irc.Done() defer irc.Done()
for { for {
select { select {
case <-irc.end: case <-irc.end:
irc.Log.Printf("got irc.end, returning")
return return
default: default:
b, ok := <-irc.pwrite b, ok := <-irc.pwrite
irc.Log.Printf("got pwrite in writeLoop()")
if !ok || b == "" || irc.socket == nil { if !ok || b == "" || irc.socket == nil {
return return
} }
@ -171,12 +174,14 @@ func (irc *Connection) Loop() {
if irc.stopped { if irc.stopped {
break break
} }
irc.Log.Printf("Error: %s\n", err) irc.Log.Printf("Error, disconnected: %s\n", err)
irc.Disconnect() //irc.Disconnect()
for !irc.stopped { for !irc.stopped {
if err = irc.Connect(irc.server); err != nil { irc.Log.Printf("Reconnecting in 3 seconds")
irc.Log.Printf("Error: %s\n", err) time.Sleep(3 * time.Second)
time.Sleep(1 * time.Second) if err = irc.Reconnect(); err != nil {
irc.Log.Printf("Error while reconnecting: %s\n", err)
//time.Sleep(1 * time.Second)
} else { } else {
break break
} }
@ -280,6 +285,7 @@ func (irc *Connection) Mode(target string, modestring ...string) {
// 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() {
fmt.Println("closing channels")
close(irc.end) close(irc.end)
close(irc.pwrite) close(irc.pwrite)
close(irc.pread) close(irc.pread)
@ -353,16 +359,17 @@ func (irc *Connection) Connect(server string) error {
irc.pread = make(chan string, 10) irc.pread = make(chan string, 10)
irc.pwrite = make(chan string, 10) irc.pwrite = make(chan string, 10)
irc.Error = make(chan error, 2) irc.Error = make(chan error, 2)
irc.Log.Printf("Created channels")
irc.Add(3) irc.Add(3)
go irc.readLoop() go irc.readLoop()
go irc.writeLoop() go irc.writeLoop()
go irc.pingLoop() go irc.pingLoop()
irc.Log.Printf("created go routines")
if len(irc.Password) > 0 { if len(irc.Password) > 0 {
irc.pwrite <- fmt.Sprintf("PASS %s\r\n", irc.Password) irc.pwrite <- fmt.Sprintf("PASS %s\r\n", irc.Password)
} }
irc.pwrite <- fmt.Sprintf("NICK %s\r\n", irc.nick) irc.pwrite <- fmt.Sprintf("NICK %s\r\n", irc.nick)
irc.Log.Printf("sent NICK")
irc.pwrite <- fmt.Sprintf("USER %s 0.0.0.0 0.0.0.0 :%s\r\n", irc.user, irc.user) irc.pwrite <- fmt.Sprintf("USER %s 0.0.0.0 0.0.0.0 :%s\r\n", irc.user, irc.user)
return nil return nil
} }