Merge branch 'develop' of https://github.com/astaxie/beego into develop

config.go

@@ -103,6 +103,8 @@ var (
 	BConfig *Config
 	// AppConfig is the instance of Config, store the config information from file
 	AppConfig *beegoAppConfig
+	// AppPath is the absolute path to the app
+	AppPath string
 	// AppConfigPath is the path to the config files
 	AppConfigPath string
 	// AppConfigProvider is the provider for the config, default is ini
@@ -111,9 +113,15 @@ var (
 	TemplateCache map[string]*template.Template
 	// GlobalSessions is the instance for the session manager
 	GlobalSessions *session.Manager
+
+	workPath string
 )
 
 func init() {
+	AppPath, _ = filepath.Abs(filepath.Dir(os.Args[0]))
+	workPath, _ = os.Getwd()
+	workPath, _ = filepath.Abs(workPath)
+
 	BConfig = &Config{
 		AppName:             "beego",
 		RunMode:             DEV,
@@ -181,13 +189,17 @@ func init() {
 func ParseConfig() (err error) {
 	if AppConfigPath == "" {
 		// initialize default configurations
-		AppPath, _ := filepath.Abs(filepath.Dir(os.Args[0]))
 		AppConfigPath = filepath.Join(AppPath, "conf", "app.conf")
 		if !utils.FileExists(AppConfigPath) {
 			AppConfig = &beegoAppConfig{config.NewFakeConfig()}
 			return
 		}
 	}
+
+	if workPath != AppPath {
+		os.Chdir(AppPath)
+	}
+
 	AppConfig, err = newAppConfig(AppConfigProvider, AppConfigPath)
 	if err != nil {
 		return err

logs/conn.go

@@ -19,6 +19,7 @@ import (
 	"io"
 	"log"
 	"net"
+	"time"
 )
 
 // connWriter implements LoggerInterface.
@@ -48,7 +49,7 @@ func (c *connWriter) Init(jsonconfig string) error {
 
 // WriteMsg write message in connection.
 // if connection is down, try to re-connect.
-func (c *connWriter) WriteMsg(msg string, level int) error {
+func (c *connWriter) WriteMsg(when time.Time, msg string, level int) error {
 	if level > c.Level {
 		return nil
 	}
@@ -62,6 +63,9 @@ func (c *connWriter) WriteMsg(msg string, level int) error {
 	if c.ReconnectOnMsg {
 		defer c.innerWriter.Close()
 	}
+
+	msg = formatLogTime(when) + msg
+
 	c.lg.Println(msg)
 	return nil
 }
@@ -94,7 +98,7 @@ func (c *connWriter) connect() error {
 	}
 
 	c.innerWriter = conn
-	c.lg = log.New(conn, "", log.Ldate|log.Ltime)
+	c.lg = log.New(conn, "", 0)
 	return nil
 }
 

logs/console.go

@@ -19,6 +19,7 @@ import (
 	"log"
 	"os"
 	"runtime"
+	"time"
 )
 
 // brush is a color join function
@@ -53,7 +54,7 @@ type consoleWriter struct {
 // NewConsole create ConsoleWriter returning as LoggerInterface.
 func NewConsole() Logger {
 	cw := &consoleWriter{
-		lg:    log.New(os.Stdout, "", log.Ldate|log.Ltime),
+		lg:    log.New(os.Stdout, "", 0),
 		Level: LevelDebug,
 	}
 	return cw
@@ -69,10 +70,11 @@ func (c *consoleWriter) Init(jsonconfig string) error {
 }
 
 // WriteMsg write message in console.
-func (c *consoleWriter) WriteMsg(msg string, level int) error {
+func (c *consoleWriter) WriteMsg(when time.Time, msg string, level int) error {
 	if level > c.Level {
 		return nil
 	}
+	msg = formatLogTime(when) + msg
 	if goos := runtime.GOOS; goos == "windows" {
 		c.lg.Println(msg)
 		return nil

logs/es/es.go

@@ -48,16 +48,16 @@ func (el *esLogger) Init(jsonconfig string) error {
 }
 
 // WriteMsg will write the msg and level into es
-func (el *esLogger) WriteMsg(msg string, level int) error {
+func (el *esLogger) WriteMsg(when time.Time, msg string, level int) error {
 	if level > el.Level {
 		return nil
 	}
-	t := time.Now()
+
 	vals := make(map[string]interface{})
-	vals["@timestamp"] = t.Format(time.RFC3339)
+	vals["@timestamp"] = when.Format(time.RFC3339)
 	vals["@msg"] = msg
 	d := goes.Document{
-		Index:  fmt.Sprintf("%04d.%02d.%02d", t.Year(), t.Month(), t.Day()),
+		Index:  fmt.Sprintf("%04d.%02d.%02d", when.Year(), when.Month(), when.Day()),
 		Type:   "logs",
 		Fields: vals,
 	}

logs/file.go

@@ -114,50 +114,14 @@ func (w *fileLogWriter) needRotate(size int, day int) bool {
 }
 
 // WriteMsg write logger message into file.
-func (w *fileLogWriter) WriteMsg(msg string, level int) error {
+func (w *fileLogWriter) WriteMsg(when time.Time, msg string, level int) error {
 	if level > w.Level {
 		return nil
 	}
 	//2016/01/12 21:34:33
-	now := time.Now()
+	// now := time.Now()
-	y, mo, d := now.Date()
+	d := when.Day()
-	h, mi, s := now.Clock()
+	msg = formatLogTime(when) + msg + "\n"
-	//len(2006/01/02 15:03:04)==19
-	var buf [20]byte
-	t := 3
-	for y >= 10 {
-		p := y / 10
-		buf[t] = byte('0' + y - p*10)
-		y = p
-		t--
-	}
-	buf[0] = byte('0' + y)
-	buf[4] = '/'
-	if mo > 9 {
-		buf[5] = '1'
-		buf[6] = byte('0' + mo - 9)
-	} else {
-		buf[5] = '0'
-		buf[6] = byte('0' + mo)
-	}
-	buf[7] = '/'
-	t = d / 10
-	buf[8] = byte('0' + t)
-	buf[9] = byte('0' + d - t*10)
-	buf[10] = ' '
-	t = h / 10
-	buf[11] = byte('0' + t)
-	buf[12] = byte('0' + h - t*10)
-	buf[13] = ':'
-	t = mi / 10
-	buf[14] = byte('0' + t)
-	buf[15] = byte('0' + mi - t*10)
-	buf[16] = ':'
-	t = s / 10
-	buf[17] = byte('0' + t)
-	buf[18] = byte('0' + s - t*10)
-	buf[19] = ' '
-	msg = string(buf[0:]) + msg + "\n"
 
 	if w.Rotate {
 		if w.needRotate(len(msg), d) {

logs/log.go

@@ -40,6 +40,7 @@ import (
 	"runtime"
 	"strconv"
 	"sync"
+	"time"
 )
 
 // RFC5424 log message levels.
@@ -68,7 +69,7 @@ type loggerType func() Logger
 // Logger defines the behavior of a log provider.
 type Logger interface {
 	Init(config string) error
-	WriteMsg(msg string, level int) error
+	WriteMsg(when time.Time, msg string, level int) error
 	Destroy()
 	Flush()
 }
@@ -108,6 +109,7 @@ type nameLogger struct {
 type logMsg struct {
 	level int
 	msg   string
+	when time.Time
 }
 
 var logMsgPool *sync.Pool
@@ -173,9 +175,9 @@ func (bl *BeeLogger) DelLogger(adapterName string) error {
 	return nil
 }
 
-func (bl *BeeLogger) writeToLoggers(msg string, level int) {
+func (bl *BeeLogger) writeToLoggers(when time.Time, msg string, level int) {
 	for _, l := range bl.outputs {
-		err := l.WriteMsg(msg, level)
+		err := l.WriteMsg(when, msg, level)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "unable to WriteMsg to adapter:%v,error:%v\n", l.name, err)
 		}
@@ -183,6 +185,7 @@ func (bl *BeeLogger) writeToLoggers(msg string, level int) {
 }
 
 func (bl *BeeLogger) writeMsg(logLevel int, msg string) error {
+	when := time.Now()
 	if bl.enableFuncCallDepth {
 		_, file, line, ok := runtime.Caller(bl.loggerFuncCallDepth)
 		if !ok {
@@ -196,9 +199,10 @@ func (bl *BeeLogger) writeMsg(logLevel int, msg string) error {
 		lm := logMsgPool.Get().(*logMsg)
 		lm.level = logLevel
 		lm.msg = msg
+		lm.when = when
 		bl.msgChan <- lm
 	} else {
-		bl.writeToLoggers(msg, logLevel)
+		bl.writeToLoggers(when, msg, logLevel)
 	}
 	return nil
 }
@@ -231,7 +235,7 @@ func (bl *BeeLogger) startLogger() {
 	for {
 		select {
 		case bm := <-bl.msgChan:
-			bl.writeToLoggers(bm.msg, bm.level)
+			bl.writeToLoggers(bm.when, bm.msg, bm.level)
 			logMsgPool.Put(bm)
 		}
 	}
@@ -351,7 +355,7 @@ func (bl *BeeLogger) Close() {
 	for {
 		if len(bl.msgChan) > 0 {
 			bm := <-bl.msgChan
-			bl.writeToLoggers(bm.msg, bm.level)
+			bl.writeToLoggers(bm.when, bm.msg, bm.level)
 			logMsgPool.Put(bm)
 			continue
 		}
@@ -362,3 +366,45 @@ func (bl *BeeLogger) Close() {
 		l.Destroy()
 	}
 }
+
+func formatLogTime(when time.Time) string {
+	y, mo, d := when.Date()
+	h, mi, s := when.Clock()
+	//len(2006/01/02 15:03:04)==19
+	var buf [20]byte
+	t := 3
+	for y >= 10 {
+		p := y / 10
+		buf[t] = byte('0' + y - p*10)
+		y = p
+		t--
+	}
+	buf[0] = byte('0' + y)
+	buf[4] = '/'
+	if mo > 9 {
+		buf[5] = '1'
+		buf[6] = byte('0' + mo - 9)
+	} else {
+		buf[5] = '0'
+		buf[6] = byte('0' + mo)
+	}
+	buf[7] = '/'
+	t = d / 10
+	buf[8] = byte('0' + t)
+	buf[9] = byte('0' + d - t*10)
+	buf[10] = ' '
+	t = h / 10
+	buf[11] = byte('0' + t)
+	buf[12] = byte('0' + h - t*10)
+	buf[13] = ':'
+	t = mi / 10
+	buf[14] = byte('0' + t)
+	buf[15] = byte('0' + mi - t*10)
+	buf[16] = ':'
+	t = s / 10
+	buf[17] = byte('0' + t)
+	buf[18] = byte('0' + s - t*10)
+	buf[19] = ' '
+
+	return string(buf[0:])
+}

logs/smtp.go

@@ -126,7 +126,7 @@ func (s *SMTPWriter) sendMail(hostAddressWithPort string, auth smtp.Auth, fromAd
 
 // WriteMsg write message in smtp writer.
 // it will send an email with subject and only this message.
-func (s *SMTPWriter) WriteMsg(msg string, level int) error {
+func (s *SMTPWriter) WriteMsg(when time.Time, msg string, level int) error {
 	if level > s.Level {
 		return nil
 	}
@@ -140,7 +140,7 @@ func (s *SMTPWriter) WriteMsg(msg string, level int) error {
 	// and send the email all in one step.
 	contentType := "Content-Type: text/plain" + "; charset=UTF-8"
 	mailmsg := []byte("To: " + strings.Join(s.RecipientAddresses, ";") + "\r\nFrom: " + s.FromAddress + "<" + s.FromAddress +
-		">\r\nSubject: " + s.Subject + "\r\n" + contentType + "\r\n\r\n" + fmt.Sprintf(".%s", time.Now().Format("2006-01-02 15:04:05")) + msg)
+		">\r\nSubject: " + s.Subject + "\r\n" + contentType + "\r\n\r\n" + fmt.Sprintf(".%s", when.Format("2006-01-02 15:04:05")) + msg)
 
 	return s.sendMail(s.Host, auth, s.FromAddress, s.RecipientAddresses, mailmsg)
 }

parser.go

@@ -130,7 +130,7 @@ func parserComments(comments *ast.CommentGroup, funcName, controllerName, pkgpat
 }
 
 func genRouterCode() {
-	os.Mkdir("routers", 0755)
+	os.Mkdir(path.Join(AppPath, "routers"), 0755)
 	Info("generate router from comments")
 	var (
 		globalinfo string
@@ -172,7 +172,7 @@ func genRouterCode() {
 		}
 	}
 	if globalinfo != "" {
-		f, err := os.Create(path.Join("routers", commentFilename))
+		f, err := os.Create(path.Join(AppPath, "routers", commentFilename))
 		if err != nil {
 			panic(err)
 		}
@@ -182,7 +182,7 @@ func genRouterCode() {
 }
 
 func compareFile(pkgRealpath string) bool {
-	if !utils.FileExists(path.Join("routers", commentFilename)) {
+	if !utils.FileExists(path.Join(AppPath, "routers", commentFilename)) {
 		return true
 	}
 	if utils.FileExists(lastupdateFilename) {