Patch for windows

Made interrupt call os.Kill for windows
Added check for process still running before killing it
This commit is contained in:
NotZippy
2018-10-30 13:28:44 -07:00
parent 5f558aca4e
commit 98e771cd01
4 changed files with 25 additions and 5 deletions

View File

@@ -15,6 +15,7 @@ import (
"github.com/revel/cmd/model" "github.com/revel/cmd/model"
"github.com/revel/cmd/utils" "github.com/revel/cmd/utils"
"runtime"
) )
// App contains the configuration for running a Revel app. (Not for the app itself) // App contains the configuration for running a Revel app. (Not for the app itself)
@@ -101,11 +102,30 @@ func (cmd AppCmd) Run() {
func (cmd AppCmd) Kill() { func (cmd AppCmd) Kill() {
if cmd.Cmd != nil && (cmd.ProcessState == nil || !cmd.ProcessState.Exited()) { if cmd.Cmd != nil && (cmd.ProcessState == nil || !cmd.ProcessState.Exited()) {
// Windows appears to send the kill to all threads, shutting down the
// server before this can, this check will ensure the process is still running
if _, err := os.FindProcess(int(cmd.Process.Pid));err!=nil {
// Server has already exited
utils.Logger.Info("Killing revel server pid", "pid", cmd.Process.Pid)
return
}
// Send an interrupt signal to allow for a graceful shutdown // Send an interrupt signal to allow for a graceful shutdown
utils.Logger.Info("Killing revel server pid", "pid", cmd.Process.Pid) utils.Logger.Info("Killing revel server pid", "pid", cmd.Process.Pid)
err := cmd.Process.Signal(os.Interrupt) var err error
if runtime.GOOS == "windows" {
// os.Interrupt is not available on windows
err = cmd.Process.Signal(os.Kill)
} else {
err = cmd.Process.Signal(os.Interrupt)
}
if err != nil { if err != nil {
utils.Logger.Fatal("Failed to kill revel server:", "error", err) utils.Logger.Error(
"Revel app failed to kill process.",
"processid", cmd.Process.Pid,"error",err,
"killerror", cmd.Process.Kill())
return
} }
// Wait for the shutdown // Wait for the shutdown

View File

@@ -88,7 +88,7 @@ type (
// The version command // The version command
Version struct { Version struct {
ImportPath string `short:"a" long:"application-path" description:"Path to application folder" required:"false"` ImportPath string `short:"a" long:"application-path" description:"Path to application folder" required:"false"`
Update bool `short:"u" long:"Update the framework and modules" required:"false"` Update bool `short:"u" long:"update" description:"Update the framework and modules" required:"false"`
} `command:"version"` } `command:"version"`
} }
) )

View File

@@ -134,7 +134,7 @@ func appendAction(fset *token.FileSet, mm methodMap, decl ast.Decl, pkgImportPat
var importPath string var importPath string
typeExpr := model.NewTypeExprFromAst(pkgName, field.Type) typeExpr := model.NewTypeExprFromAst(pkgName, field.Type)
if !typeExpr.Valid { if !typeExpr.Valid {
utils.Logger.Warn("Warn: Didn't understand argument '%s' of action %s. Ignoring.", name, getFuncName(funcDecl)) utils.Logger.Warnf("Warn: Didn't understand argument '%s' of action %s. Ignoring.", name, getFuncName(funcDecl))
return // We didn't understand one of the args. Ignore this action. return // We didn't understand one of the args. Ignore this action.
} }
// Local object // Local object

View File

@@ -6,7 +6,7 @@ package cmd
const ( const (
// Version current Revel version // Version current Revel version
Version = "0.21.0" Version = "0.21.1"
// BuildDate latest commit/release date // BuildDate latest commit/release date
BuildDate = "2018-10-30" BuildDate = "2018-10-30"