Skip to content

B
beego
Commit af346e87 authored by astaxie's avatar astaxie
Browse files
Options

Merge pull request #1603 from coseyo/remote_develop 

fix conf load bug
parents 0f85c82a cb5fd496
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
config.go
View file @ af346e87
...@@ -180,9 +180,10 @@ func init() { ...@@ -180,9 +180,10 @@ func init() {
// now only support ini, next will support json. // now only support ini, next will support json.
func ParseConfig() (err error) { func ParseConfig() (err error) {
if AppConfigPath == "" { if AppConfigPath == "" {
if utils.FileExists(filepath.Join("conf", "app.conf")) { // initialize default configurations
AppConfigPath = filepath.Join("conf", "app.conf") AppPath, _ := filepath.Abs(filepath.Dir(os.Args[0]))
} else { AppConfigPath = filepath.Join(AppPath, "conf", "app.conf")
if !utils.FileExists(AppConfigPath) {
AppConfig = &beegoAppConfig{config.NewFakeConfig()} AppConfig = &beegoAppConfig{config.NewFakeConfig()}
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment