Merge pull request #161 from notzippy/master

Patch for windows

harness/app.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/revel/cmd/model"
 	"github.com/revel/cmd/utils"
+	"runtime"
 )
 
 // 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() {
 
 	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
 		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 {
-			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

model/command_config.go

@@ -88,7 +88,7 @@ type (
 		// The version command
 		Version struct {
 			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"`
 	}
 )

parser/appends.go

@@ -134,7 +134,7 @@ func appendAction(fset *token.FileSet, mm methodMap, decl ast.Decl, pkgImportPat
 			var importPath string
 			typeExpr := model.NewTypeExprFromAst(pkgName, field.Type)
 			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.
 			}
 			// Local object

parser/imports.go

@@ -60,9 +60,10 @@ func addImports(imports map[string]string, decl ast.Decl, srcDir string) {
 
 // Returns a valid import string from the path
 // using the build.Defaul.GOPATH to determine the root
-func importPathFromPath(root string) string {
+func importPathFromPath(root, basePath string) string {
-	if vendorIdx := strings.Index(root, "/vendor/"); vendorIdx != -1 {
+	vendorTest := filepath.Join(basePath, "vendor")
-		return filepath.ToSlash(root[vendorIdx+8:])
+	if len(root) > len(vendorTest) && root[:len(vendorTest)] == vendorTest {
+		return filepath.ToSlash(root[len(vendorTest)+1:])
 	}
 	for _, gopath := range filepath.SplitList(build.Default.GOPATH) {
 		srcPath := filepath.Join(gopath, "src")

parser/reflect.go

@@ -37,7 +37,7 @@ type methodMap map[string][]*model.MethodSpec
 func ProcessSource(paths *model.RevelContainer) (_ *model.SourceInfo, compileError error) {
 	pc := &processContainer{paths: paths}
 	for _, root := range paths.CodePaths {
-		rootImportPath := importPathFromPath(root)
+		rootImportPath := importPathFromPath(root, paths.BasePath)
 		if rootImportPath == "" {
 			utils.Logger.Info("Skipping empty code path", "path", root)
 			continue

version.go

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