Changeset 702 in code for trunk/downstream.go

Timestamp:

Nov 17, 2021, 11:38:08 AM (4 years ago)

Author:

contact

Message:

Lift up context to downstreamConn.handleMessage

File:

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

trunk/downstream.go

@@ -616 +616 @@
 
 func (dc *downstreamConn) handleMessage(msg *irc.Message) error {
+        ctx, cancel := context.WithTimeout(context.TODO(), handleDownstreamMessageTimeout)
+        defer cancel()
+
         switch msg.Command {
         case "QUIT":
@@ -621 +624 @@
         default:
                 if dc.registered {
-                        return dc.handleMessageRegistered(msg)
+                        return dc.handleMessageRegistered(ctx, msg)
                 } else {
-                        return dc.handleMessageUnregistered(msg)
-                }
-        }
-}
-
-func (dc *downstreamConn) handleMessageUnregistered(msg *irc.Message) error {
-        ctx, cancel := context.WithTimeout(context.TODO(), handleDownstreamMessageTimeout)
-        defer cancel()
-
+                        return dc.handleMessageUnregistered(ctx, msg)
+                }
+        }
+}
+
+func (dc *downstreamConn) handleMessageUnregistered(ctx context.Context, msg *irc.Message) error {
         switch msg.Command {
         case "NICK":
@@ -1417 +1417 @@
 }
 
-func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
-        ctx, cancel := context.WithTimeout(context.TODO(), handleDownstreamMessageTimeout)
-        defer cancel()
-
+func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.Message) error {
         switch msg.Command {
         case "CAP":