From eb47f0dcd7ff9820be7e8795b110926155a88af3 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 17 Nov 2021 12:38:08 +0100 Subject: [PATCH] Lift up context to downstreamConn.handleMessage --- downstream.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/downstream.go b/downstream.go index b04c693..eb31a61 100644 --- a/downstream.go +++ b/downstream.go @@ -615,22 +615,22 @@ func (dc *downstreamConn) marshalMessage(msg *irc.Message, net *network) *irc.Me } func (dc *downstreamConn) handleMessage(msg *irc.Message) error { + ctx, cancel := context.WithTimeout(context.TODO(), handleDownstreamMessageTimeout) + defer cancel() + switch msg.Command { case "QUIT": return dc.Close() default: if dc.registered { - return dc.handleMessageRegistered(msg) + return dc.handleMessageRegistered(ctx, msg) } else { - return dc.handleMessageUnregistered(msg) + return dc.handleMessageUnregistered(ctx, msg) } } } -func (dc *downstreamConn) handleMessageUnregistered(msg *irc.Message) error { - ctx, cancel := context.WithTimeout(context.TODO(), handleDownstreamMessageTimeout) - defer cancel() - +func (dc *downstreamConn) handleMessageUnregistered(ctx context.Context, msg *irc.Message) error { switch msg.Command { case "NICK": var nick string @@ -1416,10 +1416,7 @@ func (dc *downstreamConn) runUntilRegistered() error { return nil } -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": var subCmd string