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

Fix handling of kill in daemon

Browse Source
This commit is contained in:
Dane Everitt 2019-04-21 12:27:53 -07:00
parent 8795e7d739
commit 3de40ddf98
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/environment_docker.go
View File

@ -163,7 +163,7 @@ func (d *DockerEnvironment) Terminate(signal os.Signal) error {
} }
d.Server.Emit(StatusEvent, ProcessStoppingState) d.Server.Emit(StatusEvent, ProcessStoppingState)
return d.Client.ContainerKill(ctx, d.Server.Uuid, signal.String()) return d.Client.ContainerKill(ctx, d.Server.Uuid, "SIGKILL")
} }
// Attaches to the docker container itself and ensures that we can pipe data in and out // Attaches to the docker container itself and ensures that we can pipe data in and out

2
websocket.go
View File

@ -131,6 +131,8 @@ func (wsh *WebsocketHandler) HandleInbound(m WebsocketMessage) error {
err = wsh.Server.Environment.Stop() err = wsh.Server.Environment.Stop()
break break
case "restart": case "restart":
break
case "kill":
err = wsh.Server.Environment.Terminate(os.Kill) err = wsh.Server.Environment.Terminate(os.Kill)
break break
} }