lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-21 23:50:54 +00:00
Code Issues Releases Activity

Merge pull request #569 from sangheee/develop

Browse Source 
Kill the server process gracefully
This commit is contained in:
Faissal Elamraoui 2019-01-10 08:30:18 +01:00 committed by GitHub
commit 12019e22af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/commands/run/watch.go
View File

@ -183,9 +183,22 @@ func Kill() {
} }
}() }()
if cmd != nil && cmd.Process != nil { if cmd != nil && cmd.Process != nil {
err := cmd.Process.Kill() cmd.Process.Signal(os.Interrupt)
if err != nil { ch := make(chan struct{}, 1)
beeLogger.Log.Errorf("Error while killing cmd process: %s", err) go func() {
cmd.Wait()
ch <- struct{}{}
}()
select {
case <-ch:
return
case <-time.After(10 * time.Second):
beeLogger.Log.Info("Timeout; Force kill cmd process")
err := cmd.Process.Kill()
if err != nil {
beeLogger.Log.Errorf("Error while killing cmd process: %s", err)
}
return
} }
} }
} }