Add info logs for starting, stopping, and attaching

code-asher · code-asher · commit ee30c9783a12 · 2023-08-09T10:39:07.000-08:00
In the case of screen, attach also starts so there is no separate start
log there.
diff --git a/agent/reconnectingpty/buffered.go b/agent/reconnectingpty/buffered.go
@@ -168,16 +168,17 @@ func (rpty *bufferedReconnectingPTY) lifecycle(ctx context.Context, logger slog.
 		logger.Debug(ctx, "killed process with error", slog.Error(err))
 	}
 
-	logger.Debug(ctx, "closed reconnecting pty")
+	logger.Info(ctx, "closed reconnecting pty")
 	rpty.state.setState(StateDone, xerrors.Errorf("reconnecting pty closed: %w", reasonErr))
 }
 
 func (rpty *bufferedReconnectingPTY) Attach(ctx context.Context, connID string, conn net.Conn, height, width uint16, logger slog.Logger) error {
+	logger.Info(ctx, "attach to reconnecting pty")
+
 	// This will kill the heartbeat once we hit EOF or an error.
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
-	logger.Debug(ctx, "reconnecting pty attach")
 	err := rpty.doAttach(ctx, connID, conn, height, width, logger)
 	if err != nil {
 		return err
diff --git a/agent/reconnectingpty/reconnectingpty.go b/agent/reconnectingpty/reconnectingpty.go
@@ -76,6 +76,9 @@ func New(ctx context.Context, cmd *pty.Cmd, options *Options, logger slog.Logger
 		}
 		logger.Debug(ctx, "auto backend selection", slog.F("backend", options.BackendType))
 	}
+
+	logger.Info(ctx, "start reconnecting pty")
+
 	switch options.BackendType {
 	case codersdk.ReconnectingPTYBackendTypeScreen:
 		return newScreen(ctx, cmd, options, logger)
diff --git a/agent/reconnectingpty/screen.go b/agent/reconnectingpty/screen.go
@@ -144,16 +144,17 @@ func (rpty *screenReconnectingPTY) lifecycle(ctx context.Context, logger slog.Lo
 		logger.Error(ctx, "close screen session", slog.Error(err))
 	}
 
-	logger.Debug(ctx, "closed reconnecting pty")
+	logger.Info(ctx, "closed reconnecting pty")
 	rpty.state.setState(StateDone, xerrors.Errorf("reconnecting pty closed: %w", reasonErr))
 }
 
 func (rpty *screenReconnectingPTY) Attach(ctx context.Context, _ string, conn net.Conn, height, width uint16, logger slog.Logger) error {
+	logger.Info(ctx, "attach to reconnecting pty")
+
 	// This will kill the heartbeat once we hit EOF or an error.
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
-	logger.Debug(ctx, "reconnecting pty attach")
 	ptty, process, err := rpty.doAttach(ctx, height, width, logger)
 	if err != nil {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,9 @@ func New(ctx context.Context, cmd pty.Cmd, options Options, logger slog.Logger`
`76`	`76`	`}`
`77`	`77`	`logger.Debug(ctx, "auto backend selection", slog.F("backend", options.BackendType))`
`78`	`78`	`}`
	`79`	`+`
	`80`	`+ logger.Info(ctx, "start reconnecting pty")`
	`81`	`+`
`79`	`82`	`switch options.BackendType {`
`80`	`83`	`case codersdk.ReconnectingPTYBackendTypeScreen:`
`81`	`84`	`return newScreen(ctx, cmd, options, logger)`