输出全部log，当调用log.close之后

Author: feixiao

.gitignore

@@ -0,0 +1 @@
+examples/ConsoleLogWriter_Manual.exe

config.go

@@ -131,7 +131,7 @@ func (log Logger) LoadConfiguration(filename string) {
 	}
 }
 
-func xmlToConsoleLogWriter(filename string, props []xmlProperty, enabled bool) (ConsoleLogWriter, bool) {
+func xmlToConsoleLogWriter(filename string, props []xmlProperty, enabled bool) (*ConsoleLogWriter, bool) {
 	// Parse properties
 	for _, prop := range props {
 		switch prop.Name {

examples/ConsoleLogWriter_Manual.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"time"
+	//"time"
 )
 
 import l4g "github.com/feixiao/log4go"
@@ -18,6 +18,6 @@ func main() {
 	log.Critical("Critical")
 	// ConsoleLogWriter 使用带缓存的chan进行输出的管理，所以不进行sleep操作
 	// 控制台没有输出，因为我们不知道什么时候channel会进行处理
-	time.Sleep(1*time.Second)
+	//time.Sleep(1*time.Second)
 	log.Close()
 }

filelog.go

@@ -37,6 +37,8 @@ type FileLogWriter struct {
 
 	// Keep old logfiles (.001, .002, etc)
 	rotate bool
+
+	wg WaitGroupWrapper
 }
 
 // This is the FileLogWriter's output method
@@ -46,6 +48,8 @@ func (w *FileLogWriter) LogWrite(rec *LogRecord) {
 
 func (w *FileLogWriter) Close() {
 	close(w.rec)
+	w.wg.Wait()
+
 }
 
 // NewFileLogWriter creates a new LogWriter which writes to the given file and
@@ -72,7 +76,9 @@ func NewFileLogWriter(fname string, rotate bool) *FileLogWriter {
 		return nil
 	}
 
-	go func() {
+
+
+	worker := func() {
 		defer func() {
 			if w.file != nil {
 				fmt.Fprint(w.file, FormatLogRecord(w.trailer, &LogRecord{Created: time.Now()}))
@@ -113,7 +119,9 @@ func NewFileLogWriter(fname string, rotate bool) *FileLogWriter {
 				w.maxsize_cursize += n
 			}
 		}
-	}()
+	}
+
+	w.wg.Wrap(worker)
 
 	return w
 }

termlog.go

@@ -8,23 +8,35 @@ import (
 	"fmt"
 )
 
-var stdout io.Writer = os.Stdout
+
 
 // This is the standard writer that prints to standard output.
-type ConsoleLogWriter chan *LogRecord
+//type ConsoleLogWriter  chan *LogRecord
+
+type ConsoleLogWriter struct {
+	logChan  chan *LogRecord
+	wg       WaitGroupWrapper
+	stdout   io.Writer
+}
 
 // This creates a new ConsoleLogWriter
-func NewConsoleLogWriter() ConsoleLogWriter {
-	records := make(ConsoleLogWriter, LogBufferLength)
-	go records.run(stdout)
-	return records
+func NewConsoleLogWriter() *ConsoleLogWriter {
+	w := &ConsoleLogWriter{
+		logChan: make(chan *LogRecord, LogBufferLength),
+		stdout: os.Stdout,
+	}
+	w.wg.Wrap(func(){w.run()})
+	return w
 }
 
-func (w ConsoleLogWriter) run(out io.Writer) {
+func (w *ConsoleLogWriter) run() {
+
 	var timestr string
 	var timestrAt int64
 
-	for rec := range w {
+	out := w.stdout
+
+	for rec := range w.logChan {
 		if at := rec.Created.UnixNano() / 1e9; at != timestrAt {
 			timestr, timestrAt = rec.Created.Format("01/02/06 15:04:05"), at
 		}
@@ -34,12 +46,13 @@ func (w ConsoleLogWriter) run(out io.Writer) {
 
 // This is the ConsoleLogWriter's output method.  This will block if the output
 // buffer is full.
-func (w ConsoleLogWriter) LogWrite(rec *LogRecord) {
-	w <- rec
+func (w *ConsoleLogWriter) LogWrite(rec *LogRecord) {
+	w.logChan <- rec
 }
 
 // Close stops the logger from sending messages to standard output.  Attempts to
 // send log messages to this logger after a Close have undefined behavior.
-func (w ConsoleLogWriter) Close() {
-	close(w)
+func (w *ConsoleLogWriter) Close() {
+	close(w.logChan)
+	w.wg.Wait()
 }

wait_group_wrapper.go

@@ -0,0 +1,17 @@
+package log4go
+
+import (
+	"sync"
+)
+
+type WaitGroupWrapper struct {
+	sync.WaitGroup
+}
+
+func (w *WaitGroupWrapper) Wrap(cb func()) {
+	w.Add(1)
+	go func() {
+		cb()
+		w.Done()
+	}()
+}