提交 68d4c2c0 编写于 作者: S slene

fix: AppPath is wrong. Move BeeLogger to config.go init.

上级 de0113ae
......@@ -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
......
......@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册