From 68d4c2c0d8447a6fbbea9d8c2e3df2400fff2f14 Mon Sep 17 00:00:00 2001
From: slene <vslene@gmail.com>
Date: Thu, 19 Dec 2013 12:22:30 +0800
Subject: [PATCH] fix: AppPath is wrong. Move BeeLogger to config.go init.

---
 config.go | 13 +++++++++----
 log.go    |  5 -----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config.go b/config.go
index 0a376e05..3a03a45c 100644
--- a/config.go
+++ b/config.go
@@ -3,12 +3,13 @@ package beego
 import (
 	"html/template"
 	"os"
-	"path"
+	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
 
 	"github.com/astaxie/beego/config"
+	"github.com/astaxie/beego/logs"
 	"github.com/astaxie/beego/session"
 )
 
@@ -64,8 +65,8 @@ func init() {
 	BeeApp = NewApp()
 
 	// initialize default configurations
-	os.Chdir(path.Dir(os.Args[0]))
-	AppPath = path.Dir(os.Args[0])
+	AppPath, _ = filepath.Abs(filepath.Dir(os.Args[0]))
+	os.Chdir(AppPath)
 
 	StaticDir = make(map[string]string)
 	StaticDir["/static"] = "static"
@@ -103,7 +104,7 @@ func init() {
 
 	EnableGzip = false
 
-	AppConfigPath = path.Join(AppPath, "conf", "app.conf")
+	AppConfigPath = filepath.Join(AppPath, "conf", "app.conf")
 
 	HttpServerTimeOut = 0
 
@@ -123,6 +124,10 @@ func init() {
 
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
+	// init BeeLogger
+	BeeLogger = logs.NewLogger(10000)
+	BeeLogger.SetLogger("console", "")
+
 	err := ParseConfig()
 	if err != nil && !os.IsNotExist(err) {
 		// for init if doesn't have app.conf will not panic
diff --git a/log.go b/log.go
index d508a5a6..201ac80a 100644
--- a/log.go
+++ b/log.go
@@ -25,11 +25,6 @@ func SetLevel(l int) {
 // logger references the used application logger.
 var BeeLogger *logs.BeeLogger
 
-func init() {
-	BeeLogger = logs.NewLogger(10000)
-	BeeLogger.SetLogger("console", "")
-}
-
 // SetLogger sets a new logger.
 func SetLogger(adaptername string, config string) {
 	BeeLogger.SetLogger(adaptername, config)