NotificationsYou must be signed in to change notification settings
Fork925
Star10.1k

Commitb6e7498

authored

fix(agent/reconnectingpty): generate rpty id before starting lifecycle (#15475)

Fixes#12687There was a race condition where we would start the rpty lifecyclebefore generating the ID, leading to a data race where we would try toconcurrently read and write the struct field.

1 parentbc9d875 commitb6e7498Copy full SHA for b6e7498

File tree

1 file changed

-2

lines changed

agent/reconnectingpty
- screen.go

1 file changed

-2

lines changed

`‎agent/reconnectingpty/screen.go`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,6 @@ func newScreen(ctx context.Context, cmd pty.Cmd, options Options, logger slog.`
`67`	`67`	`timeout:options.Timeout,`
`68`	`68`	`}`
`69`	`69`
`70`		`-gorpty.lifecycle(ctx,logger)`
`71`		`-`
`72`	`70`	`// Socket paths are limited to around 100 characters on Linux and macOS which`
`73`	`71`	`// depending on the temporary directory can be a problem. To give more leeway`
`74`	`72`	`// use a short ID.`
`@@ -80,6 +78,8 @@ func newScreen(ctx context.Context, cmd pty.Cmd, options Options, logger slog.`
`80`	`78`	`}`
`81`	`79`	`rpty.id=hex.EncodeToString(buf)`
`82`	`80`
	`81`	`+gorpty.lifecycle(ctx,logger)`
	`82`	`+`
`83`	`83`	`settings:= []string{`
`84`	`84`	`// Disable the startup message that appears for five seconds.`
`85`	`85`	`"startup_message off",`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb6e7498

File tree

1 file changed

1 file changed

`‎agent/reconnectingpty/screen.go`

0 commit comments