Changeset 776 in code

Timestamp:

Feb 8, 2022, 3:37:31 PM (3 years ago)

Author:

contact

Message:

Add context to upstreamConn.runUntilRegistered

Location:

trunk

Files:

• upstream.go (modified) (3 diffs)
• user.go (modified) (1 diff)

trunk/upstream.go

@@ -1956 +1956 @@
 }
 
-func (uc *upstreamConn) runUntilRegistered() error {
+func (uc *upstreamConn) runUntilRegistered(ctx context.Context) error {
         for !uc.registered {
                 msg, err := uc.ReadMessage()
@@ -1963 +1963 @@
                 }
 
-                if err := uc.handleMessage(context.TODO(), msg); err != nil {
+                if err := uc.handleMessage(ctx, msg); err != nil {
                         if _, ok := err.(registrationError); ok {
                                 return err
@@ -1978 +1978 @@
                         uc.logger.Printf("failed to parse connect command %q: %v", command, err)
                 } else {
-                        uc.SendMessage(context.TODO(), m)
+                        uc.SendMessage(ctx, m)
                 }
         }

trunk/user.go

@@ -222 +222 @@
 
                 uc.register()
-                if err := uc.runUntilRegistered(); err != nil {
+                if err := uc.runUntilRegistered(context.TODO()); err != nil {
                         text := err.Error()
                         temp := true