Merge pull request revel#1243 from notzippy/pre-release

notzippy · web-flow · commit 9aa8c8696bd1 · 2017-09-25T09:07:31.000-07:00
Vendoring fixes
diff --git a/logger.go b/logger.go
@@ -28,7 +28,7 @@ var (
 	// DEPRECATED
 	oldLog = AppLog.New("section", "deprecated")
 	// System logger
-	sysLog = AppLog.New("section", "system")
+	SysLog = AppLog.New("section", "system")
 	// DEPRECATED Use AppLog
 	TRACE = log.New(os.Stderr, "TRACE ", log.Ldate|log.Ltime|log.Lshortfile)
 	// DEPRECATED Use AppLog
@@ -82,9 +82,9 @@ func setAppLog(appLog logger.MultiLogger, appHandler *logger.CompositeMultiHandl
 
 		// Set the system log handler - this sets golang writer stream to the
 		// sysLog router
-		logger.SetDefaultLog(sysLog)
-		sysLog.SetStackDepth(5)
-		sysLog.SetHandler(appLogHandler)
+		logger.SetDefaultLog(SysLog)
+		SysLog.SetStackDepth(5)
+		SysLog.SetHandler(appLogHandler)
 	}
 }
 
diff --git a/module.go b/module.go
@@ -83,18 +83,22 @@ func (m *Module) AddController(ct *ControllerType) {
 // Only to be used on initialization
 func ModuleFromPath(path string, addGopathToPath bool) (module *Module) {
 	gopathList := filepath.SplitList(build.Default.GOPATH)
+	// ignore the vendor folder
+	if i := strings.Index(path, "/vendor/"); i > 0 {
+		path = path[i+len("vendor/"):]
+	}
 
 	// See if the path exists in the module based
 	for i := range Modules {
 		if addGopathToPath {
 			for _, gopath := range gopathList {
-				if strings.HasPrefix(filepath.ToSlash(filepath.Clean(filepath.Join(gopath,"src",path))), Modules[i].Path) {
+				if strings.Contains(filepath.ToSlash(filepath.Clean(filepath.Join(gopath, "src", path))), Modules[i].Path) {
 					module = Modules[i]
 					break
 				}
 			}
 		} else {
-			if strings.HasPrefix(path, Modules[i].Path) {
+			if strings.Contains(path, Modules[i].ImportPath) {
 				module = Modules[i]
 				break
 			}
@@ -159,17 +163,10 @@ func loadModules() {
 
 	// Modules loaded, now show module path
 	for key, callback := range appModule.initializedModules {
-		found := false
-		for _, m := range Modules {
-			if strings.HasPrefix(key, m.ImportPath) {
-				moduleLog.Debug("Module called callback", "moduleKey", m.ImportPath, "callbackKey", key)
-				callback(m)
-				found = true
-				break
-			}
-		}
-		if !found {
-			RevelLog.Error("Callback for non registered module initializing with application module","modulePath",key)
+		if m := ModuleFromPath(key, false); m != nil {
+			callback(m)
+		} else {
+			RevelLog.Error("Callback for non registered module initializing with application module", "modulePath", key)
 			callback(appModule)
 		}
 	}
diff --git a/revel.go b/revel.go
@@ -231,7 +231,7 @@ func ResolveImportPath(importPath string) (string, error) {
 		return filepath.Join(SourcePath, importPath), nil
 	}
 
-	modPkg, err := build.Import(importPath, "", build.FindOnly)
+	modPkg, err := build.Import(importPath, RevelPath, build.FindOnly)
 	if err != nil {
 		return "", err
 	}
@@ -269,10 +269,10 @@ func findSrcPaths(importPath string) (revelSourcePath, appSourcePath string) {
 		RevelLog.Panic("Failed to import "+importPath+" with error:", "error", err)
 	}
 
-	revelPkg, err := build.Import(RevelImportPath, "", build.FindOnly)
+	revelPkg, err := build.Import(RevelImportPath, appPkg.Dir, build.FindOnly)
 	if err != nil {
 		RevelLog.Fatal("Failed to find Revel with error:", "error", err)
 	}
 
-	return revelPkg.SrcRoot, appPkg.SrcRoot
+	return revelPkg.Dir[:len(revelPkg.Dir)-len(RevelImportPath)], appPkg.SrcRoot
 }

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ func ResolveImportPath(importPath string) (string, error) {`
`231`	`231`	`return filepath.Join(SourcePath, importPath), nil`
`232`	`232`	`}`
`233`	`233`
`234`		`- modPkg, err := build.Import(importPath, "", build.FindOnly)`
	`234`	`+ modPkg, err := build.Import(importPath, RevelPath, build.FindOnly)`
`235`	`235`	`if err != nil {`
`236`	`236`	`return "", err`
`237`	`237`	`}`
`@@ -269,10 +269,10 @@ func findSrcPaths(importPath string) (revelSourcePath, appSourcePath string) {`
`269`	`269`	`RevelLog.Panic("Failed to import "+importPath+" with error:", "error", err)`
`270`	`270`	`}`
`271`	`271`
`272`		`- revelPkg, err := build.Import(RevelImportPath, "", build.FindOnly)`
	`272`	`+ revelPkg, err := build.Import(RevelImportPath, appPkg.Dir, build.FindOnly)`
`273`	`273`	`if err != nil {`
`274`	`274`	`RevelLog.Fatal("Failed to find Revel with error:", "error", err)`
`275`	`275`	`}`
`276`	`276`
`277`		`- return revelPkg.SrcRoot, appPkg.SrcRoot`
	`277`	`+ return revelPkg.Dir[:len(revelPkg.Dir)-len(RevelImportPath)], appPkg.SrcRoot`
`278`	`278`	`}`