|
@@ -101,13 +101,15 @@ type Yyn struct {
|
|
|
HeartBeat string
|
|
|
}
|
|
|
|
|
|
-func Setup(dir string) {
|
|
|
+func Setup() {
|
|
|
var err error
|
|
|
- if strings.Trim(dir, " ") == "" {
|
|
|
+ workDir := os.Getenv("GO_WORK_DIR")
|
|
|
+ if workDir == "" {
|
|
|
CurrentPath, err = GetCurrentPath()
|
|
|
} else {
|
|
|
- CurrentPath = dir
|
|
|
+ CurrentPath = workDir
|
|
|
}
|
|
|
+
|
|
|
cfg, err = ini.Load(CurrentPath + "conf/app.ini")
|
|
|
if err != nil {
|
|
|
log.Fatalf("setting.Setup, fail to parse 'conf/app.ini': %v", err)
|