chore: clarify error variable name in doAttach (#17284)

aaronlehmann · web-flow · commit 8cc743a812ba · 2025-04-16T14:44:33.000+05:00
diff --git a/agent/reconnectingpty/screen.go b/agent/reconnectingpty/screen.go
@@ -307,9 +307,9 @@ func (rpty *screenReconnectingPTY) doAttach(ctx context.Context, conn net.Conn,
 		if closeErr != nil {
 			logger.Debug(ctx, "closed ptty with error", slog.Error(closeErr))
 		}
-		closeErr = process.Kill()
-		if closeErr != nil {
-			logger.Debug(ctx, "killed process with error", slog.Error(closeErr))
+		killErr := process.Kill()
+		if killErr != nil {
+			logger.Debug(ctx, "killed process with error", slog.Error(killErr))
 		}
 		rpty.metrics.WithLabelValues("screen_wait").Add(1)
 		return nil, nil, err

Original file line number	Diff line number	Diff line change
`@@ -307,9 +307,9 @@ func (rpty *screenReconnectingPTY) doAttach(ctx context.Context, conn net.Conn,`
`307`	`307`	`if closeErr != nil {`
`308`	`308`	`logger.Debug(ctx, "closed ptty with error", slog.Error(closeErr))`
`309`	`309`	`}`
`310`		`- closeErr = process.Kill()`
`311`		`- if closeErr != nil {`
`312`		`- logger.Debug(ctx, "killed process with error", slog.Error(closeErr))`
	`310`	`+ killErr := process.Kill()`
	`311`	`+ if killErr != nil {`
	`312`	`+ logger.Debug(ctx, "killed process with error", slog.Error(killErr))`
`313`	`313`	`}`
`314`	`314`	`rpty.metrics.WithLabelValues("screen_wait").Add(1)`
`315`	`315`	`return nil, nil, err`