Changeset 701 in code for trunk

Timestamp:

Nov 17, 2021, 11:33:30 AM (4 years ago)

Author:

contact

Message:

Add context arg to downstreamConn.welcome()

Location:

trunk

Files:

• downstream.go (modified) (8 diffs)
• user.go (modified) (2 diffs)

trunk/downstream.go

@@ -1127 +1127 @@
 }
 
-func (dc *downstreamConn) loadNetwork() error {
+func (dc *downstreamConn) loadNetwork(ctx context.Context) error {
         if dc.networkName == "" {
                 return nil
@@ -1140 +1140 @@
 
                 dc.logger.Printf("trying to connect to new network %q", addr)
-                if err := sanityCheckServer(context.TODO(), addr); err != nil {
+                if err := sanityCheckServer(ctx, addr); err != nil {
                         dc.logger.Printf("failed to connect to %q: %v", addr, err)
                         return ircError{&irc.Message{
@@ -1155 +1155 @@
                 dc.logger.Printf("auto-saving network %q", dc.networkName)
                 var err error
-                network, err = dc.user.createNetwork(context.TODO(), &Network{
+                network, err = dc.user.createNetwork(ctx, &Network{
                         Addr:    dc.networkName,
                         Nick:    nick,
@@ -1169 +1169 @@
 }
 
-func (dc *downstreamConn) welcome() error {
+func (dc *downstreamConn) welcome(ctx context.Context) error {
         if dc.user == nil || !dc.registered {
                 panic("tried to welcome an unregistered connection")
@@ -1177 +1177 @@
         // instead, but we'll potentially be adding a new network and this must be
         // done in the user goroutine.
-        if err := dc.loadNetwork(); err != nil {
+        if err := dc.loadNetwork(ctx); err != nil {
                 return err
         }
@@ -1323 +1323 @@
                                 }
 
-                                dc.sendTargetBacklog(net, target, lastDelivered)
+                                dc.sendTargetBacklog(ctx, net, target, lastDelivered)
 
                                 // Fast-forward history to last message
@@ -1353 +1353 @@
 }
 
-func (dc *downstreamConn) sendTargetBacklog(net *network, target, msgID string) {
+func (dc *downstreamConn) sendTargetBacklog(ctx context.Context, net *network, target, msgID string) {
         if dc.caps["draft/chathistory"] || dc.user.msgStore == nil {
                 return
@@ -1360 +1360 @@
         ch := net.channels.Value(target)
 
-        ctx, cancel := context.WithTimeout(context.TODO(), backlogTimeout)
+        ctx, cancel := context.WithTimeout(ctx, backlogTimeout)
         defer cancel()
 

trunk/user.go

@@ -315 +315 @@
 
                 if detachedMsgID != "" {
-                        dc.sendTargetBacklog(net, ch.Name, detachedMsgID)
+                        dc.sendTargetBacklog(context.TODO(), net, ch.Name, detachedMsgID)
                 }
         })
@@ -598 +598 @@
                         }
 
-                        if err := dc.welcome(); err != nil {
+                        if err := dc.welcome(context.TODO()); err != nil {
                                 dc.logger.Printf("failed to handle new registered connection: %v", err)
                                 break