sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close connection from writer goroutine

Browse Source 
Connections were being closed from the reader goroutine, causing issues
when sending messages and immediately closing the connection.
This commit is contained in:
Simon Ser 2020-02-07 12:42:24 +01:00
parent e17c0b3aca
commit 519cdd9e38
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
downstream.go
View File

@ -70,6 +70,11 @@ func newDownstreamConn(srv *Server, netConn net.Conn) *downstreamConn {
conn.logger.Printf("failed to write message: %v", err) conn.logger.Printf("failed to write message: %v", err)
} }
} }
if err := conn.net.Close(); err != nil {
conn.logger.Printf("failed to close connection: %v", err)
} else {
conn.logger.Printf("connection closed")
}
}() }()
return conn return conn
@ -85,7 +90,6 @@ func (c *downstreamConn) prefix() *irc.Prefix {
func (c *downstreamConn) readMessages() error { func (c *downstreamConn) readMessages() error {
c.logger.Printf("new connection") c.logger.Printf("new connection")
defer c.Close()
for { for {
msg, err := c.irc.ReadMessage() msg, err := c.irc.ReadMessage()
@ -108,7 +112,7 @@ func (c *downstreamConn) readMessages() error {
} }
} }
return c.Close() return nil
} }
func (c *downstreamConn) Close() error { func (c *downstreamConn) Close() error {
@ -129,7 +133,7 @@ func (c *downstreamConn) Close() error {
close(c.messages) close(c.messages)
c.closed = true c.closed = true
return c.net.Close() return nil
} }
func (c *downstreamConn) handleMessage(msg *irc.Message) error { func (c *downstreamConn) handleMessage(msg *irc.Message) error {

12
upstream.go
View File

@ -71,6 +71,11 @@ func connectToUpstream(u *user, upstream *Upstream) (*upstreamConn, error) {
conn.logger.Printf("failed to write message: %v", err) conn.logger.Printf("failed to write message: %v", err)
} }
} }
if err := conn.net.Close(); err != nil {
conn.logger.Printf("failed to close connection: %v", err)
} else {
conn.logger.Printf("connection closed")
}
}() }()
return conn, nil return conn, nil
@ -80,9 +85,6 @@ func (c *upstreamConn) Close() error {
if c.closed { if c.closed {
return fmt.Errorf("upstream connection already closed") return fmt.Errorf("upstream connection already closed")
} }
if err := c.net.Close(); err != nil {
return err
}
close(c.messages) close(c.messages)
c.closed = true c.closed = true
return nil return nil
@ -330,8 +332,6 @@ func (c *upstreamConn) register() {
} }
func (c *upstreamConn) readMessages() error { func (c *upstreamConn) readMessages() error {
defer c.Close()
for { for {
msg, err := c.irc.ReadMessage() msg, err := c.irc.ReadMessage()
if err == io.EOF { if err == io.EOF {
@ -345,5 +345,5 @@ func (c *upstreamConn) readMessages() error {
} }
} }
return c.Close() return nil
} }