MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't add a stack for deadline exceeded when terminating

Browse Source
This commit is contained in:
Dane Everitt 2020-11-12 20:50:15 -08:00
parent 8081c83de4
commit 672fb860ea
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
environment/docker/power.go
View File

@ -193,7 +193,12 @@ func (e *Environment) WaitForStop(seconds uint, terminate bool) error {
case err := <-errChan: case err := <-errChan:
if err != nil { if err != nil {
if terminate { if terminate {
log.WithField("container_id", e.Id).WithField("error", errors.WithStackIf(err)).Warn("error while waiting for container stop, attempting process termination") l := log.WithField("container_id", e.Id)
if errors.Is(err, context.DeadlineExceeded) {
l.Warn("deadline exceeded for container stop; terminating process")
} else {
l.WithField("error", errors.WithStackIf(err)).Warn("error while waiting for container stop; terminating process")
}
return errors.WithStackIf(e.Terminate(os.Kill)) return errors.WithStackIf(e.Terminate(os.Kill))
} }