Changeset 56 in code for trunk/downstream.go

Timestamp:

Feb 17, 2020, 11:41:27 AM (5 years ago)

Author:

contact

Message:

Add downstreamConn.writeMessages

This logic will become more complicated in upcoming commits.

File:

• trunk/downstream.go (modified) (4 diffs)

trunk/downstream.go

@@ -45 +45 @@
         srv      *Server
         logger   Logger
-        messages chan<- *irc.Message
+        messages chan *irc.Message
 
         registered bool
@@ -56 +56 @@
 
 func newDownstreamConn(srv *Server, netConn net.Conn) *downstreamConn {
-        msgs := make(chan *irc.Message, 64)
         dc := &downstreamConn{
                 net:      netConn,
@@ -62 +61 @@
                 srv:      srv,
                 logger:   &prefixLogger{srv.Logger, fmt.Sprintf("downstream %q: ", netConn.RemoteAddr())},
-                messages: msgs,
+                messages: make(chan *irc.Message, 64),
         }
 
         go func() {
-                for msg := range msgs {
-                        if err := dc.irc.WriteMessage(msg); err != nil {
-                                dc.logger.Printf("failed to write message: %v", err)
-                        }
+                if err := dc.writeMessages(); err != nil {
+                        dc.logger.Printf("failed to write message: %v", err)
                 }
                 if err := dc.net.Close(); err != nil {
@@ -113 +110 @@
         }
 
+        return nil
+}
+
+func (dc *downstreamConn) writeMessages() error {
+        for msg := range dc.messages {
+                if err := dc.irc.WriteMessage(msg); err != nil {
+                        return err
+                }
+        }
         return nil
 }