revert some changes but also update err chan for new connection so further errors are received in Loop
This commit is contained in:
parent
937f84605b
commit
5a16c2581e
8
irc.go
8
irc.go
@ -196,6 +196,7 @@ func (irc *Connection) Loop() {
|
|||||||
irc.Log.Printf("Error while reconnecting: %s\n", err)
|
irc.Log.Printf("Error while reconnecting: %s\n", err)
|
||||||
time.Sleep(60 * time.Second)
|
time.Sleep(60 * time.Second)
|
||||||
} else {
|
} else {
|
||||||
|
errChan = irc.ErrorChan()
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -366,9 +367,6 @@ func (irc *Connection) Disconnect() {
|
|||||||
// Reconnect to a server using the current connection.
|
// Reconnect to a server using the current connection.
|
||||||
func (irc *Connection) Reconnect() error {
|
func (irc *Connection) Reconnect() error {
|
||||||
if irc.end != nil {
|
if irc.end != nil {
|
||||||
for i := 0; i < 5; i++ {
|
|
||||||
irc.end <- 1
|
|
||||||
}
|
|
||||||
close(irc.end)
|
close(irc.end)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -376,7 +374,7 @@ func (irc *Connection) Reconnect() error {
|
|||||||
|
|
||||||
irc.Wait() //make sure that wait group is cleared ensuring that all spawned goroutines have completed
|
irc.Wait() //make sure that wait group is cleared ensuring that all spawned goroutines have completed
|
||||||
|
|
||||||
irc.end = make(chan int, 5)
|
irc.end = make(chan struct{})
|
||||||
return irc.Connect(irc.Server)
|
return irc.Connect(irc.Server)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -464,7 +462,7 @@ func IRC(nick, user string) *Connection {
|
|||||||
nickcurrent: nick,
|
nickcurrent: nick,
|
||||||
user: user,
|
user: user,
|
||||||
Log: log.New(os.Stdout, "", log.LstdFlags),
|
Log: log.New(os.Stdout, "", log.LstdFlags),
|
||||||
end: make(chan int, 5),
|
end: make(chan struct{}),
|
||||||
Version: VERSION,
|
Version: VERSION,
|
||||||
KeepAlive: 4 * time.Minute,
|
KeepAlive: 4 * time.Minute,
|
||||||
Timeout: 1 * time.Minute,
|
Timeout: 1 * time.Minute,
|
||||||
|
@ -27,7 +27,7 @@ type Connection struct {
|
|||||||
|
|
||||||
socket net.Conn
|
socket net.Conn
|
||||||
pwrite chan string
|
pwrite chan string
|
||||||
end chan int
|
end chan struct{}
|
||||||
|
|
||||||
nick string //The nickname we want.
|
nick string //The nickname we want.
|
||||||
nickcurrent string //The nickname we currently have.
|
nickcurrent string //The nickname we currently have.
|
||||||
|
Loading…
Reference in New Issue
Block a user