mirror of
https://github.com/astaxie/beego.git
synced 2024-11-22 23:30:54 +00:00
panic if parse failed
This commit is contained in:
parent
fb6312a303
commit
420e816bed
7
beego.go
7
beego.go
@ -67,13 +67,12 @@ func InsertFilter(pattern string, pos int, filter FilterFunc) *App {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func Run() {
|
func Run() {
|
||||||
//if AppConfigPath not In the conf/app.conf reParse config
|
// if AppConfigPath not In the conf/app.conf reParse config
|
||||||
if AppConfigPath != path.Join(AppPath, "conf", "app.conf") {
|
if AppConfigPath != path.Join(AppPath, "conf", "app.conf") {
|
||||||
err := ParseConfig()
|
err := ParseConfig()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if RunMode == "dev" {
|
// configuration is critical to app, panic here if parse failed
|
||||||
Warn(err)
|
panic(err)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
39
config.go
39
config.go
@ -59,18 +59,32 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
os.Chdir(path.Dir(os.Args[0]))
|
// create beeapp
|
||||||
BeeApp = NewApp()
|
BeeApp = NewApp()
|
||||||
|
|
||||||
|
// initialize default configurations
|
||||||
|
os.Chdir(path.Dir(os.Args[0]))
|
||||||
AppPath = path.Dir(os.Args[0])
|
AppPath = path.Dir(os.Args[0])
|
||||||
|
|
||||||
StaticDir = make(map[string]string)
|
StaticDir = make(map[string]string)
|
||||||
|
StaticDir["/static"] = "static"
|
||||||
|
|
||||||
TemplateCache = make(map[string]*template.Template)
|
TemplateCache = make(map[string]*template.Template)
|
||||||
HttpAddr = ""
|
|
||||||
|
// set this to 0.0.0.0 to make this app available to externally
|
||||||
|
HttpAddr = "127.0.0.1"
|
||||||
HttpPort = 8080
|
HttpPort = 8080
|
||||||
|
|
||||||
AppName = "beego"
|
AppName = "beego"
|
||||||
|
|
||||||
RunMode = "dev" //default runmod
|
RunMode = "dev" //default runmod
|
||||||
|
|
||||||
AutoRender = true
|
AutoRender = true
|
||||||
|
|
||||||
RecoverPanic = true
|
RecoverPanic = true
|
||||||
|
|
||||||
ViewsPath = "views"
|
ViewsPath = "views"
|
||||||
|
|
||||||
SessionOn = false
|
SessionOn = false
|
||||||
SessionProvider = "memory"
|
SessionProvider = "memory"
|
||||||
SessionName = "beegosessionID"
|
SessionName = "beegosessionID"
|
||||||
@ -79,23 +93,38 @@ func init() {
|
|||||||
SessionHashFunc = "sha1"
|
SessionHashFunc = "sha1"
|
||||||
SessionHashKey = "beegoserversessionkey"
|
SessionHashKey = "beegoserversessionkey"
|
||||||
SessionCookieLifeTime = 3600
|
SessionCookieLifeTime = 3600
|
||||||
|
|
||||||
UseFcgi = false
|
UseFcgi = false
|
||||||
|
|
||||||
MaxMemory = 1 << 26 //64MB
|
MaxMemory = 1 << 26 //64MB
|
||||||
|
|
||||||
EnableGzip = false
|
EnableGzip = false
|
||||||
StaticDir["/static"] = "static"
|
|
||||||
AppConfigPath = path.Join(AppPath, "conf", "app.conf")
|
AppConfigPath = path.Join(AppPath, "conf", "app.conf")
|
||||||
|
|
||||||
HttpServerTimeOut = 0
|
HttpServerTimeOut = 0
|
||||||
|
|
||||||
ErrorsShow = true
|
ErrorsShow = true
|
||||||
|
|
||||||
XSRFKEY = "beegoxsrf"
|
XSRFKEY = "beegoxsrf"
|
||||||
XSRFExpire = 0
|
XSRFExpire = 0
|
||||||
|
|
||||||
TemplateLeft = "{{"
|
TemplateLeft = "{{"
|
||||||
TemplateRight = "}}"
|
TemplateRight = "}}"
|
||||||
|
|
||||||
BeegoServerName = "beegoServer"
|
BeegoServerName = "beegoServer"
|
||||||
|
|
||||||
EnableAdmin = true
|
EnableAdmin = true
|
||||||
AdminHttpAddr = "localhost"
|
AdminHttpAddr = "127.0.0.1"
|
||||||
AdminHttpPort = 8088
|
AdminHttpPort = 8088
|
||||||
ParseConfig()
|
|
||||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||||
|
|
||||||
|
err := ParseConfig()
|
||||||
|
if err != nil && !os.IsNotExist(err) {
|
||||||
|
// panic unless the err is can not find default configuration file
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func ParseConfig() (err error) {
|
func ParseConfig() (err error) {
|
||||||
|
Loading…
Reference in New Issue
Block a user