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

Avoid triggering crash detection on container destroy

Browse Source
This commit is contained in:
Dane Everitt 2020-01-19 14:00:59 -08:00
parent 59299d3cda
commit ab54d2c416
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
http.go
View File

@ -501,6 +501,7 @@ func (rt *Router) routeServerDelete(w http.ResponseWriter, r *http.Request, ps h
// to start it while this process is running. // to start it while this process is running.
s.Suspended = true s.Suspended = true
zap.S().Infow("processing server deletion request", zap.String("server", s.Uuid))
// Destroy the environment; in Docker this will handle a running container and // Destroy the environment; in Docker this will handle a running container and
// forcibly terminate it before removing the container, so we do not need to handle // forcibly terminate it before removing the container, so we do not need to handle
// that here. // that here.

3
server/environment_docker.go
View File

@ -292,6 +292,9 @@ func (d *DockerEnvironment) Terminate(signal os.Signal) error {
func (d *DockerEnvironment) Destroy() error { func (d *DockerEnvironment) Destroy() error {
ctx := context.Background() ctx := context.Background()
// Avoid crash detection firing off.
d.Server.SetState(ProcessStoppingState)
return d.Client.ContainerRemove(ctx, d.Server.Uuid, types.ContainerRemoveOptions{ return d.Client.ContainerRemove(ctx, d.Server.Uuid, types.ContainerRemoveOptions{
RemoveVolumes: true, RemoveVolumes: true,
RemoveLinks: false, RemoveLinks: false,