Skip to content

Commit

Permalink
flush bufferred log on exit
Browse files Browse the repository at this point in the history
  • Loading branch information
philchia committed Dec 22, 2016
1 parent d196a4d commit 249114e
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 8 deletions.
22 changes: 17 additions & 5 deletions gollog.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package gol

import (
"fmt"
"os"
"runtime"

"bytes"
Expand All @@ -13,21 +14,27 @@ import (
)

type gollog struct {
level LogLevel
option LogOption
adapters []adapter.Adapter
logChan chan string
level LogLevel
option LogOption
adapters []adapter.Adapter
logChan chan string
doneChan chan struct{}
signalChan chan os.Signal
}

func (l *gollog) msgPump() {
for {
select {
case msg := <-l.logChan:
case msg, ok := <-l.logChan:
if !ok {
break
}
for _, adap := range l.adapters {
adap.Write(internal.Str2bytes(msg))
}
}
}
close(l.doneChan)
}

func (l *gollog) put(msg string) {
Expand Down Expand Up @@ -209,3 +216,8 @@ func (l *gollog) AddLogAdapter(a adapter.Adapter) {
l.adapters = append(l.adapters, a)
}
}

func (l *gollog) flush() {
close(l.logChan)
<-l.doneChan
}
20 changes: 17 additions & 3 deletions logger.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package gol

import (
"os"

"os/signal"

"github.com/philchia/gol/adapter"
"github.com/philchia/gol/adapter/console"
)
Expand Down Expand Up @@ -30,11 +34,21 @@ type Logger interface {
// NewLogger create a Logger
func NewLogger(level LogLevel) Logger {
logger := &gollog{
level: level,
option: LstdFlags,
logChan: make(chan string, 1024),
level: level,
option: LstdFlags,
logChan: make(chan string, 1024),
doneChan: make(chan struct{}),
signalChan: make(chan os.Signal, 1),
}

signal.Notify(logger.signalChan, os.Interrupt, os.Kill)
logger.AddLogAdapter(console.NewAdapter())
go func() {
select {
case <-logger.signalChan:
logger.flush()
}
}()

go logger.msgPump()
return logger
Expand Down

0 comments on commit 249114e

Please sign in to comment.