Merge pull request #569 from tucksaun/refactor/improve-cleaning-up-workers-errors

fabpot · web-flow · commit 738d842193f8 · 2025-02-17T09:51:15.000+01:00
refactor: improve cleaning up stale temp directories if workers fail to stop
diff --git a/commands/local_server_start.go b/commands/local_server_start.go
@@ -413,15 +413,16 @@ var localServerStartCmd = &console.Command{
 		case <-shutdownCh:
 			terminal.Eprintln("")
 			terminal.Eprintln("Shutting down! Waiting for all workers to be done.")
-			if err := waitForWorkers(projectDir, pidFile); err != nil {
-				return err
-			}
-			terminal.Eprintln("")
+			err := waitForWorkers(projectDir, pidFile)
 			// wait for the PHP Server to be done cleaning up
 			if p.PHPServer != nil {
 				<-p.PHPServer.StoppedChan
 			}
 			pidFile.CleanupDirectories()
+			if err != nil {
+				return err
+			}
+			terminal.Eprintln("")
 			ui.Success("Stopped all processes successfully")
 		}
 		return nil
