Skip to content

Improve error handling on process start #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 12, 2024
Merged

Improve error handling on process start #91

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b2476f
Improve error handling on process start
klapkov Jan 18, 2024
6b449a4
Add test case
klapkov Jan 18, 2024
7af3c72
Make new method private
klapkov Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions depot/steps/run_step.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,10 @@ func (step *runStep) Run(signals <-chan os.Signal, ready chan<- struct{}) error
select {
case err := <-errChan:
if err != nil {
step.logger.Error("failed-creating-process", err, lager.Data{"duration": step.clock.Now().Sub(runStartTime)})
processErrorMessage := "failed-creating-process"
step.logger.Error(processErrorMessage, err, lager.Data{"duration": step.clock.Now().Sub(runStartTime)})
step.WriteToStdOut(fmt.Sprintf("%s: %s", processErrorMessage, err))

return err
}
case process = <-processChan:
Expand Down Expand Up @@ -227,10 +230,7 @@ func (step *runStep) Run(signals <-chan os.Signal, ready chan<- struct{}) error
}
}

if !step.model.SuppressLogOutput {
step.streamer.Stdout().Write([]byte(exitErrorMessage))
step.streamer.Flush()
}
step.WriteToStdOut(exitErrorMessage)

if killed {
return new(ExceededGracefulShutdownIntervalError)
Expand Down Expand Up @@ -349,3 +349,10 @@ func (step *runStep) networkingEnvVars() []string {

return envVars
}

func (step *runStep) WriteToStdOut(message string) {
if !step.model.SuppressLogOutput {
step.streamer.Stdout().Write([]byte(message))
step.streamer.Flush()
}
}
12 changes: 12 additions & 0 deletions depot/steps/run_step_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,18 @@ var _ = Describe("RunAction", func() {

})
})

Context("when Garden Run errors out", func() {
BeforeEach(func() {
gardenClient.Connection.RunStub = func(string, garden.ProcessSpec, garden.ProcessIO) (garden.Process, error) {
return nil, errors.New("some-error-from-garden")
}
})

It("it receives an error from the streamer", func() {
Expect(fakeStreamer.Stdout()).To(gbytes.Say("failed-creating-process: some-error-from-garden"))
})
})
})

Context("CF_INSTANCE_* networking env vars", func() {
Expand Down