lbsadmin
/
bee
mirror of https://github.com/beego/bee.git
1
0
Fork 0
Code Issues Releases Activity

Merge pull request #159 from youngsterxyf/develop 

fix #1552 in beego, see: https://github.com/astaxie/beego/issues/1552
This commit is contained in:
astaxie 2016-01-11 13:14:25 +08:00
parent f997f5b625 685da50d93
commit ba6fe73334
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
run.go
View File

@ -134,7 +134,7 @@ func readAppDirectories(directory string, paths *[]string) {
continue
}
if isExcluded(fileInfo) {
if isExcluded(path.Join(directory, fileInfo.Name())) {
continue
}
@ -157,10 +157,20 @@ func readAppDirectories(directory string, paths *[]string) {
}
// If a file is excluded
func isExcluded(fileInfo os.FileInfo) bool {
func isExcluded(filePath string) bool {
for _, p := range excludedPaths {
if strings.HasSuffix(fileInfo.Name(), p) {
ColorLog("[INFO] Excluding from watching [ %s ]\n", fileInfo.Name())
absP, err := path.Abs(p)
if err != nil {
ColorLog("[ERROR] Can not get absolute path of [ %s ]\n", p)
continue
}
absFilePath, err := path.Abs(filePath)
if err != nil {
ColorLog("[ERROR] Can not get absolute path of [ %s ]\n", filePath)
break
}
if strings.HasPrefix(absFilePath, absP) {
ColorLog("[INFO] Excluding from watching [ %s ]\n", filePath)
return true
}
}