merge multi commit

config.go

@@ -15,11 +15,11 @@
 package beego
 
 import (
+	"fmt"
 	"html/template"
 	"os"
 	"path/filepath"
 	"strings"
-	"fmt"
 
 	"github.com/astaxie/beego/config"
 	"github.com/astaxie/beego/session"
@@ -299,7 +299,7 @@ func parseConfig(appConfigPath string) (err error) {
 	}
 
 	//init log
-	BeeLogger.Close()
+	BeeLogger.Reset()
 	for adaptor, config := range BConfig.Log.Outputs {
 		err = BeeLogger.SetLogger(adaptor, config)
 		if err != nil {

logs/log.go

@@ -98,8 +98,8 @@ type BeeLogger struct {
 	loggerFuncCallDepth int
 	asynchronous        bool
 	msgChan             chan *logMsg
-	signalChan			chan string
+	signalChan          chan string
-	wg					sync.WaitGroup
+	wg                  sync.WaitGroup
 	outputs             []*nameLogger
 }
 
@@ -111,7 +111,7 @@ type nameLogger struct {
 type logMsg struct {
 	level int
 	msg   string
-	when time.Time
+	when  time.Time
 }
 
 var logMsgPool *sync.Pool
@@ -125,7 +125,6 @@ func NewLogger(channelLen int64) *BeeLogger {
 	bl.loggerFuncCallDepth = 2
 	bl.msgChan = make(chan *logMsg, channelLen)
 	bl.signalChan = make(chan string, 1)
-	bl.wg.Add(1)
 	return bl
 }
 
@@ -137,6 +136,7 @@ func (bl *BeeLogger) Async() *BeeLogger {
 			return &logMsg{}
 		},
 	}
+	bl.wg.Add(1)
 	go bl.startLogger()
 	return bl
 }
@@ -236,6 +236,7 @@ func (bl *BeeLogger) EnableFuncCallDepth(b bool) {
 // start logger chan reading.
 // when chan is not empty, write logs.
 func (bl *BeeLogger) startLogger() {
+	gameOver := false
 	for {
 		select {
 		case bm := <-bl.msgChan:
@@ -243,26 +244,19 @@ func (bl *BeeLogger) startLogger() {
 			logMsgPool.Put(bm)
 		case sg := <-bl.signalChan:
 			// Now should only send "flush" or "close" to bl.signalChan
-			for {
+			bl.flush()
-				if len(bl.msgChan) > 0 {
-					bm := <-bl.msgChan
-					bl.writeToLoggers(bm.when, bm.msg, bm.level)
-					logMsgPool.Put(bm)
-					continue
-				}
-				break
-			}
-			for _, l := range bl.outputs {
-				l.Flush()
-			}
 			if sg == "close" {
 				for _, l := range bl.outputs {
 					l.Destroy()
 				}
 				bl.outputs = nil
+				gameOver = true
 			}
 			bl.wg.Done()
 		}
+		if gameOver {
+			break
+		}
 	}
 }
 
@@ -370,16 +364,53 @@ func (bl *BeeLogger) Trace(format string, v ...interface{}) {
 
 // Flush flush all chan data.
 func (bl *BeeLogger) Flush() {
-	bl.signalChan <- "flush"
+	if bl.asynchronous {
-	bl.wg.Wait()
+		bl.signalChan <- "flush"
-	bl.wg.Add(1)
+		bl.wg.Wait()
+		bl.wg.Add(1)
+		return
+	}
+	bl.flush()
 }
 
 // Close close logger, flush all chan data and destroy all adapters in BeeLogger.
 func (bl *BeeLogger) Close() {
-	bl.signalChan <- "close"
+	if bl.asynchronous {
-	bl.wg.Wait()
+		bl.signalChan <- "close"
-	bl.wg.Add(1)
+		bl.wg.Wait()
+	} else {
+		bl.flush()
+		for _, l := range bl.outputs {
+			l.Destroy()
+		}
+		bl.outputs = nil
+	}
+	close(bl.msgChan)
+	close(bl.signalChan)
+}
+
+// Reset close all outputs, and set bl.outputs to nil
+func (bl *BeeLogger) Reset() {
+	bl.Flush()
+	for _, l := range bl.outputs {
+		l.Destroy()
+	}
+	bl.outputs = nil
+}
+
+func (bl *BeeLogger) flush() {
+	for {
+		if len(bl.msgChan) > 0 {
+			bm := <-bl.msgChan
+			bl.writeToLoggers(bm.when, bm.msg, bm.level)
+			logMsgPool.Put(bm)
+			continue
+		}
+		break
+	}
+	for _, l := range bl.outputs {
+		l.Flush()
+	}
 }
 
 func formatLogTime(when time.Time) string {