lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-26 01:11:30 +00:00
Code Issues Releases Activity

tweak: Exit with message instead of a panic

Browse Source 
In case no application is found in GOPATH(s), exit with a friendly
message instead of a panic. Also removed useless else block in watch.go.
This commit is contained in:
Faissal Elamraoui 2016-09-26 20:32:14 +02:00
parent 287af20d1a
commit 56568f4d2c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
run.go
View File

@ -87,7 +87,7 @@ func runApp(cmd *Command, args []string) int {
currentGoPath = _gopath currentGoPath = _gopath
appname = path.Base(currpath) appname = path.Base(currpath)
} else { } else {
panic(fmt.Sprintf("No Beego application '%s' found in your GOPATH", args[0])) exitPrint(fmt.Sprintf("No Beego application '%s' found in your GOPATH", args[0]))
} }
ColorLog("[INFO] Using '%s' as 'appname'\n", appname) ColorLog("[INFO] Using '%s' as 'appname'\n", appname)
@ -103,13 +103,13 @@ func runApp(cmd *Command, args []string) int {
Debugf("current path:%s\n", currpath) Debugf("current path:%s\n", currpath)
if runmode == "prod" || runmode == "dev"{ if runmode == "prod" || runmode == "dev" {
os.Setenv("BEEGO_RUNMODE", runmode) os.Setenv("BEEGO_RUNMODE", runmode)
ColorLog("[INFO] Using '%s' as 'runmode'\n", os.Getenv("BEEGO_RUNMODE")) ColorLog("[INFO] Using '%s' as 'runmode'\n", os.Getenv("BEEGO_RUNMODE"))
}else if runmode != ""{ } else if runmode != "" {
os.Setenv("BEEGO_RUNMODE", runmode) os.Setenv("BEEGO_RUNMODE", runmode)
ColorLog("[WARN] Using '%s' as 'runmode'\n", os.Getenv("BEEGO_RUNMODE")) ColorLog("[WARN] Using '%s' as 'runmode'\n", os.Getenv("BEEGO_RUNMODE"))
}else if os.Getenv("BEEGO_RUNMODE") != ""{ } else if os.Getenv("BEEGO_RUNMODE") != "" {
ColorLog("[WARN] Using '%s' as 'runmode'\n", os.Getenv("BEEGO_RUNMODE")) ColorLog("[WARN] Using '%s' as 'runmode'\n", os.Getenv("BEEGO_RUNMODE"))
} }

3
watch.go
View File

@ -240,9 +240,8 @@ func shouldIgnoreFile(filename string) bool {
} }
if r.MatchString(filename) { if r.MatchString(filename) {
return true return true
} else {
continue
} }
continue
} }
return false return false
} }