Commit738d842

authored

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

refactor: improve cleaning up stale temp directories if workers fail to stop

2 parents4d89b47 +c86f25b commit738d842Copy full SHA for 738d842

File tree

-4

lines changed

-4

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -413,15 +413,16 @@ var localServerStartCmd = &console.Command{`
`413`	`413`	`case<-shutdownCh:`
`414`	`414`	`terminal.Eprintln("")`
`415`	`415`	`terminal.Eprintln("Shutting down! Waiting for all workers to be done.")`
`416`		`-iferr:=waitForWorkers(projectDir,pidFile);err!=nil {`
`417`		`-returnerr`
`418`		`-}`
`419`		`-terminal.Eprintln("")`
	`416`	`+err:=waitForWorkers(projectDir,pidFile)`
`420`	`417`	`// wait for the PHP Server to be done cleaning up`
`421`	`418`	`ifp.PHPServer!=nil {`
`422`	`419`	`<-p.PHPServer.StoppedChan`
`423`	`420`	`}`
`424`	`421`	`pidFile.CleanupDirectories()`
	`422`	`+iferr!=nil {`
	`423`	`+returnerr`
	`424`	`+}`
	`425`	`+terminal.Eprintln("")`
`425`	`426`	`ui.Success("Stopped all processes successfully")`
`426`	`427`	`}`
`427`	`428`	`returnnil`

Comments

(0)