Changeset 103 in code for trunk/downstream.go

Timestamp:

Mar 16, 2020, 11:44:59 AM (5 years ago)

Author:

contact

Message:

Per-user dispatcher goroutine

This allows message handlers to read upstream/downstream connection
information without causing any race condition.

References: ​https://todo.sr.ht/~emersion/soju/1

File:

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

trunk/downstream.go

@@ -192 +192 @@
 }
 
-func (dc *downstreamConn) readMessages() error {
+func (dc *downstreamConn) readMessages(ch chan<- downstreamIncomingMessage) error {
         dc.logger.Printf("new connection")
 
@@ -207 +207 @@
                 }
 
-                err = dc.handleMessage(msg)
-                if ircErr, ok := err.(ircError); ok {
-                        ircErr.Message.Prefix = dc.srv.prefix()
-                        dc.SendMessage(ircErr.Message)
-                } else if err != nil {
-                        return fmt.Errorf("failed to handle IRC command %q: %v", msg.Command, err)
-                }
-
-                if dc.isClosed() {
-                        return nil
-                }
+                ch <- downstreamIncomingMessage{msg, dc}
         }
 
@@ -485 +475 @@
 }
 
+func (dc *downstreamConn) runUntilRegistered() error {
+        for !dc.registered {
+                msg, err := dc.irc.ReadMessage()
+                if err == io.EOF {
+                        break
+                } else if err != nil {
+                        return fmt.Errorf("failed to read IRC command: %v", err)
+                }
+
+                err = dc.handleMessage(msg)
+                if ircErr, ok := err.(ircError); ok {
+                        ircErr.Message.Prefix = dc.srv.prefix()
+                        dc.SendMessage(ircErr.Message)
+                } else if err != nil {
+                        return fmt.Errorf("failed to handle IRC command %q: %v", msg, err)
+                }
+        }
+
+        return nil
+}
+
 func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
         switch msg.Command {