From e281b6e82a49be5bfe5e0137f1d5c5101ca8ef0d Mon Sep 17 00:00:00 2001 From: youngsterxyf Date: Wed, 30 Mar 2016 10:49:39 +0800 Subject: [PATCH] improve --- config.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/config.go b/config.go index c1ee7ae6..22074bd7 100644 --- a/config.go +++ b/config.go @@ -106,8 +106,6 @@ var ( AppConfig *beegoAppConfig // AppPath is the absolute path to the app AppPath string - // workPath is the absolute path of the current dir - workPath string // GlobalSessions is the instance for the session manager GlobalSessions *session.Manager @@ -118,11 +116,6 @@ var ( ) func init() { - AppPath, _ = filepath.Abs(filepath.Dir(os.Args[0])) - - workPath, _ = os.Getwd() - workPath, _ = filepath.Abs(workPath) - BConfig = &Config{ AppName: "beego", RunMode: DEV, @@ -183,6 +176,16 @@ func init() { }, } + var err error + + if AppPath, err = filepath.Abs(filepath.Dir(os.Args[0])); err != nil { + panic(err) + } + workPath, err := os.Getwd() + if err != nil { + panic(err) + } + appConfigPath = filepath.Join(workPath, "conf", "app.conf") if !utils.FileExists(appConfigPath) { appConfigPath = filepath.Join(AppPath, "conf", "app.conf") @@ -192,7 +195,7 @@ func init() { } } - if err := parseConfig(appConfigPath); err != nil { + if err = parseConfig(appConfigPath); err != nil { panic(err) } }