fixup! Fix startup/shutdown script log messaging

mafredri · mafredri · commit e90df490f427 · 2023-02-10T13:20:36.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -296,47 +296,48 @@ func (a *agent) run(ctx context.Context) error {
 		}
 
 		lifecycleState := codersdk.WorkspaceAgentLifecycleReady
-		if metadata.StartupScript != "" {
-			scriptDone := make(chan error, 1)
-			scriptStart := time.Now()
-			err := a.trackConnGoroutine(func() {
-				defer close(scriptDone)
-				scriptDone <- a.runStartupScript(ctx, metadata.StartupScript)
-			})
-			if err != nil {
-				return xerrors.Errorf("track startup script: %w", err)
+		scriptDone := make(chan error, 1)
+		scriptStart := time.Now()
+		err = a.trackConnGoroutine(func() {
+			defer close(scriptDone)
+			scriptDone <- a.runStartupScript(ctx, metadata.StartupScript)
+		})
+		if err != nil {
+			return xerrors.Errorf("track startup script: %w", err)
+		}
+		go func() {
+			var timeout <-chan time.Time
+			// If timeout is zero, an older version of the coder
+			// provider was used. Otherwise a timeout is always > 0.
+			if metadata.StartupScriptTimeout > 0 {
+				t := time.NewTimer(metadata.StartupScriptTimeout)
+				defer t.Stop()
+				timeout = t.C
 			}
-			go func() {
-				var timeout <-chan time.Time
-				// If timeout is zero, an older version of the coder
-				// provider was used. Otherwise a timeout is always > 0.
-				if metadata.StartupScriptTimeout > 0 {
-					t := time.NewTimer(metadata.StartupScriptTimeout)
-					defer t.Stop()
-					timeout = t.C
-				}
 
-				var err error
-				select {
-				case err = <-scriptDone:
-				case <-timeout:
-					a.logger.Warn(ctx, "startup script timed out")
-					a.setLifecycle(ctx, codersdk.WorkspaceAgentLifecycleStartTimeout)
-					err = <-scriptDone // The script can still complete after a timeout.
-				}
-				if errors.Is(err, context.Canceled) {
-					return
-				}
+			var err error
+			select {
+			case err = <-scriptDone:
+			case <-timeout:
+				a.logger.Warn(ctx, "startup script timed out")
+				a.setLifecycle(ctx, codersdk.WorkspaceAgentLifecycleStartTimeout)
+				err = <-scriptDone // The script can still complete after a timeout.
+			}
+			if errors.Is(err, context.Canceled) {
+				return
+			}
+			// Only log if there was a startup script.
+			if metadata.StartupScript != "" {
 				execTime := time.Since(scriptStart)
 				if err != nil {
 					a.logger.Warn(ctx, "startup script failed", slog.F("execution_time", execTime), slog.Error(err))
 					lifecycleState = codersdk.WorkspaceAgentLifecycleStartError
 				} else {
 					a.logger.Info(ctx, "startup script completed", slog.F("execution_time", execTime))
 				}
-			}()
-		}
-		a.setLifecycle(ctx, lifecycleState)
+			}
+			a.setLifecycle(ctx, lifecycleState)
+		}()
 	}
 
 	// This automatically closes when the context ends!
