Fix startup/shutdown script log messaging

mafredri · mafredri · commit 1a9f64626d6b · 2023-02-10T11:10:59.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -295,47 +295,48 @@ func (a *agent) run(ctx context.Context) error {
 			}
 		}
 
-		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
-			}
-
-			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
-			}
-			execTime := time.Since(scriptStart)
-			lifecycleState := codersdk.WorkspaceAgentLifecycleReady
+		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 {
-				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))
+				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
+				}
 
-			a.setLifecycle(ctx, lifecycleState)
-		}()
+				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
+				}
+				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)
 	}
 
 	// This automatically closes when the context ends!
@@ -1230,7 +1231,7 @@ func (a *agent) Close() error {
 	// TODO(mafredri): Only run shutdown script if the agent is 'ready'?
 
 	lifecycleState := codersdk.WorkspaceAgentLifecycleOff
-	if metadata, ok := a.metadata.Load().(agentsdk.Metadata); ok {
+	if metadata, ok := a.metadata.Load().(agentsdk.Metadata); ok && metadata.ShutdownScript != "" {
 		scriptDone := make(chan error, 1)
 		scriptStart := time.Now()
 		go func() {
