Stop irc and websocket writer goroutines when the connection closes
This commit is contained in:
parent
e47cb5f0e4
commit
e55760a1a5
4 changed files with 34 additions and 17 deletions
|
@ -228,12 +228,15 @@ func (i *IRC) writef(format string, a ...interface{}) {
|
|||
func (i *IRC) send() {
|
||||
i.ready.Wait()
|
||||
for {
|
||||
i.conn.Write([]byte(<-i.out))
|
||||
_, err := i.conn.Write([]byte(<-i.out))
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (i *IRC) recv() {
|
||||
defer i.conn.Close()
|
||||
defer i.close()
|
||||
for {
|
||||
line, err := i.reader.ReadString('\n')
|
||||
if err != nil {
|
||||
|
@ -256,6 +259,12 @@ func (i *IRC) recv() {
|
|||
}
|
||||
}
|
||||
|
||||
func (i *IRC) close() {
|
||||
i.conn.Close()
|
||||
i.ready.Done()
|
||||
close(i.out)
|
||||
}
|
||||
|
||||
func parseMessage(line string) *Message {
|
||||
line = strings.Trim(line, "\r\n")
|
||||
msg := Message{}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue