Move lifecycle after buffer and process are set

code-asher · code-asher · commit c7978db56705 · 2023-08-09T10:32:56.000-08:00
The lifecycle will try to close the process (and before it would clear
the buffer as well) so they need to be set.
diff --git a/agent/reconnectingpty/buffered.go b/agent/reconnectingpty/buffered.go
@@ -52,8 +52,6 @@ func newBuffered(ctx context.Context, cmd *pty.Cmd, options *Options, logger slo
 		timeout:     options.Timeout,
 	}
 
-	go rpty.lifecycle(ctx, logger)
-
 	// Default to buffer 64KiB.
 	circularBuffer, err := circbuf.NewBuffer(64 << 10)
 	if err != nil {
@@ -75,6 +73,8 @@ func newBuffered(ctx context.Context, cmd *pty.Cmd, options *Options, logger slo
 	rpty.ptty = ptty
 	rpty.process = process
 
+	go rpty.lifecycle(ctx, logger)
+
 	// Multiplex the output onto the circular buffer and each active connection.
 	// We do not need to separately monitor for the process exiting.  When it
 	// exits, our ptty.OutputReader() will return EOF after reading all process
@@ -125,7 +125,7 @@ func newBuffered(ctx context.Context, cmd *pty.Cmd, options *Options, logger slo
 }
 
 // lifecycle manages the lifecycle of the reconnecting pty.  If the context ends
-// the reconnecting pty will be closed.
+// the reconnecting pty and every connection will be closed.
 func (rpty *bufferedReconnectingPTY) lifecycle(ctx context.Context, logger slog.Logger) {
 	rpty.timer = time.AfterFunc(attachTimeout, func() {
 		rpty.Close("reconnecting pty timeout")
