Changeset 45 in code for trunk

Timestamp:

Feb 7, 2020, 11:42:24 AM (5 years ago)

Author:

contact

Message:

Close connection from writer goroutine

Connections were being closed from the reader goroutine, causing issues
when sending messages and immediately closing the connection.

Location:

trunk

Files:

• downstream.go (modified) (4 diffs)
• upstream.go (modified) (4 diffs)

trunk/downstream.go

@@ -71 +71 @@
                         }
                 }
+                if err := conn.net.Close(); err != nil {
+                        conn.logger.Printf("failed to close connection: %v", err)
+                } else {
+                        conn.logger.Printf("connection closed")
+                }
         }()
 
@@ -86 +91 @@
 func (c *downstreamConn) readMessages() error {
         c.logger.Printf("new connection")
-        defer c.Close()
 
         for {
@@ -109 +113 @@
         }
 
-        return c.Close()
+        return nil
 }
 
@@ -130 +134 @@
         c.closed = true
 
-        return c.net.Close()
+        return nil
 }
 

trunk/upstream.go

@@ -72 +72 @@
                         }
                 }
+                if err := conn.net.Close(); err != nil {
+                        conn.logger.Printf("failed to close connection: %v", err)
+                } else {
+                        conn.logger.Printf("connection closed")
+                }
         }()
 
@@ -80 +85 @@
         if c.closed {
                 return fmt.Errorf("upstream connection already closed")
-        }
-        if err := c.net.Close(); err != nil {
-                return err
         }
         close(c.messages)
@@ -331 +333 @@
 
 func (c *upstreamConn) readMessages() error {
-        defer c.Close()
-
         for {
                 msg, err := c.irc.ReadMessage()
@@ -346 +346 @@
         }
 
-        return c.Close()
-}
+        return nil
+}