Changeset 33 in code for trunk

Timestamp:

Feb 6, 2020, 9:46:46 PM (5 years ago)

Author:

contact

Message:

Use a dedicated goroutine to write upstream messages

File:

• trunk/upstream.go (modified) (6 diffs)

trunk/upstream.go

@@ -29 +29 @@
         irc      *irc.Conn
         srv      *Server
+        messages chan<- *irc.Message
 
         serverName            string
@@ -36 +37 @@
 
         registered bool
+        closed     bool
         modes      modeSet
         channels   map[string]*upstreamChannel
+}
+
+func connectToUpstream(s *Server, upstream *Upstream) (*upstreamConn, error) {
+        logger := &prefixLogger{s.Logger, fmt.Sprintf("upstream %q: ", upstream.Addr)}
+        logger.Printf("connecting to server")
+
+        netConn, err := tls.Dial("tcp", upstream.Addr, nil)
+        if err != nil {
+                return nil, fmt.Errorf("failed to dial %q: %v", upstream.Addr, err)
+        }
+
+        msgs := make(chan *irc.Message, 64)
+        conn := &upstreamConn{
+                upstream: upstream,
+                logger:   logger,
+                net:      netConn,
+                irc:      irc.NewConn(netConn),
+                srv:      s,
+                messages: msgs,
+                channels: make(map[string]*upstreamChannel),
+        }
+
+        go func() {
+                for msg := range msgs {
+                        if err := conn.irc.WriteMessage(msg); err != nil {
+                                conn.logger.Printf("failed to write message: %v", err)
+                        }
+                }
+        }()
+
+        return conn, nil
+}
+
+func (c *upstreamConn) Close() error {
+        if c.closed {
+                return fmt.Errorf("upstream connection already closed")
+        }
+        if err := c.net.Close(); err != nil {
+                return err
+        }
+        close(c.messages)
+        c.closed = true
+        return nil
 }
 
@@ -52 +97 @@
         case "PING":
                 // TODO: handle params
-                return c.irc.WriteMessage(&irc.Message{
+                c.messages <- &irc.Message{
                         Command: "PONG",
                         Params:  []string{c.srv.Hostname},
-                })
+                }
+                return nil
         case "MODE":
                 if len(msg.Params) < 2 {
@@ -71 +117 @@
 
                 for _, ch := range c.upstream.Channels {
-                        err := c.irc.WriteMessage(&irc.Message{
+                        c.messages <- &irc.Message{
                                 Command: "JOIN",
                                 Params:  []string{ch},
-                        })
-                        if err != nil {
-                                return err
                         }
                 }
@@ -192 +235 @@
 
 func (c *upstreamConn) readMessages() error {
-        defer c.net.Close()
-
-        err := c.irc.WriteMessage(&irc.Message{
+        defer c.Close()
+
+        c.messages <- &irc.Message{
                 Command: "NICK",
                 Params:  []string{c.upstream.Nick},
-        })
-        if err != nil {
-                return err
-        }
-
-        err = c.irc.WriteMessage(&irc.Message{
+        }
+
+        c.messages <- &irc.Message{
                 Command: "USER",
                 Params:  []string{c.upstream.Username, "0", "*", c.upstream.Realname},
-        })
-        if err != nil {
-                return err
         }
 
@@ -223 +260 @@
         }
 
-        return c.net.Close()
-}
-
-func connectToUpstream(s *Server, upstream *Upstream) (*upstreamConn, error) {
-        logger := &prefixLogger{s.Logger, fmt.Sprintf("upstream %q: ", upstream.Addr)}
-        logger.Printf("connecting to server")
-
-        netConn, err := tls.Dial("tcp", upstream.Addr, nil)
-        if err != nil {
-                return nil, fmt.Errorf("failed to dial %q: %v", upstream.Addr, err)
-        }
-
-        return &upstreamConn{
-                upstream: upstream,
-                logger:   logger,
-                net:      netConn,
-                irc:      irc.NewConn(netConn),
-                srv:      s,
-                channels: make(map[string]*upstreamChannel),
-        }, nil
-}
+        return c.Close()
+}