fix(agent): log correct script timeout for startup script (#9190)

mafredri · web-flow · commit bbaa057e1587 · 2023-08-18T17:35:49.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -654,7 +654,7 @@ func (a *agent) run(ctx context.Context) error {
 			select {
 			case err = <-scriptDone:
 			case <-timeout:
-				a.logger.Warn(ctx, "script timed out", slog.F("lifecycle", "startup"), slog.F("timeout", manifest.ShutdownScriptTimeout))
+				a.logger.Warn(ctx, "script timed out", slog.F("lifecycle", "startup"), slog.F("timeout", manifest.StartupScriptTimeout))
 				a.setLifecycle(ctx, codersdk.WorkspaceAgentLifecycleStartTimeout)
 				err = <-scriptDone // The script can still complete after a timeout.
 			}

Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,7 @@ func (a *agent) run(ctx context.Context) error {`
`654`	`654`	`select {`
`655`	`655`	`case err = <-scriptDone:`
`656`	`656`	`case <-timeout:`
`657`		`- a.logger.Warn(ctx, "script timed out", slog.F("lifecycle", "startup"), slog.F("timeout", manifest.ShutdownScriptTimeout))`
	`657`	`+ a.logger.Warn(ctx, "script timed out", slog.F("lifecycle", "startup"), slog.F("timeout", manifest.StartupScriptTimeout))`
`658`	`658`	`a.setLifecycle(ctx, codersdk.WorkspaceAgentLifecycleStartTimeout)`
`659`	`659`	`err = <-scriptDone // The script can still complete after a timeout.`
`660`	`660`	`}`