Compare commits
2 Commits
4811fbbbe5
...
20e440f79d
Author | SHA1 | Date |
---|---|---|
kingecg | 20e440f79d | |
kingecg | a6aaaa7495 |
|
@ -9,7 +9,7 @@
|
|||
"type": "go",
|
||||
"request": "launch",
|
||||
"mode": "auto",
|
||||
"program": "${fileDirname}",
|
||||
"program": "${workspaceFolder}/test",
|
||||
"cwd": "${workspaceFolder}",
|
||||
}
|
||||
]
|
||||
|
|
|
@ -35,9 +35,9 @@ func (c *ConsoleAppender) Append(logEvent LogEvent) {
|
|||
fmt.Printf(TraceTemplate, logMsg)
|
||||
}
|
||||
}
|
||||
func makeConsoleAppender(appenderConfig LogAppenderConfig) LoggerAppender {
|
||||
func makeConsoleAppender(appenderConfig LogAppenderConfig) *LoggerAppender {
|
||||
var appender LoggerAppender = &ConsoleAppender{}
|
||||
return appender
|
||||
return &appender
|
||||
}
|
||||
func init() {
|
||||
RegistAppender("console", makeConsoleAppender)
|
||||
|
|
24
file.go
24
file.go
|
@ -7,6 +7,7 @@ import (
|
|||
|
||||
type FileAppender struct {
|
||||
filePath string
|
||||
lchan chan LogEvent
|
||||
file *os.File
|
||||
}
|
||||
|
||||
|
@ -14,7 +15,8 @@ func (f *FileAppender) GetName() string {
|
|||
return "FileAppender:" + f.filePath
|
||||
}
|
||||
|
||||
func (f *FileAppender) Append(logEvent LogEvent) {
|
||||
func (f *FileAppender) start() {
|
||||
f.lchan = make(chan LogEvent, 10)
|
||||
if f.file == nil || int(f.file.Fd()) == -1 {
|
||||
dirName := filepath.Dir(f.filePath)
|
||||
_, err := os.Stat(dirName)
|
||||
|
@ -24,12 +26,21 @@ func (f *FileAppender) Append(logEvent LogEvent) {
|
|||
f.file, _ = os.OpenFile(f.filePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
|
||||
}
|
||||
|
||||
logMsg := format(logEvent)
|
||||
f.file.WriteString(logMsg)
|
||||
go func() {
|
||||
defer f.file.Close()
|
||||
for {
|
||||
logEvent := <-f.lchan
|
||||
logMsg := format(logEvent)
|
||||
f.file.WriteString(logMsg)
|
||||
}
|
||||
}()
|
||||
}
|
||||
func (f *FileAppender) Append(logEvent LogEvent) {
|
||||
|
||||
f.lchan <- logEvent
|
||||
}
|
||||
|
||||
func makeFileAppender(appenderConfig LogAppenderConfig) LoggerAppender {
|
||||
func makeFileAppender(appenderConfig LogAppenderConfig) *LoggerAppender {
|
||||
var logfile interface{}
|
||||
var ok bool
|
||||
logfile, ok = appenderConfig.Options["file"]
|
||||
|
@ -39,7 +50,10 @@ func makeFileAppender(appenderConfig LogAppenderConfig) LoggerAppender {
|
|||
var ret LoggerAppender = &FileAppender{
|
||||
filePath: logfile.(string),
|
||||
}
|
||||
return ret
|
||||
|
||||
ret.(*FileAppender).start()
|
||||
|
||||
return &ret
|
||||
}
|
||||
|
||||
func init() {
|
||||
|
|
37
main.go
37
main.go
|
@ -22,9 +22,9 @@ var logLevelMap map[string]int = map[string]int{
|
|||
"debug": Debug,
|
||||
"trace": Trace,
|
||||
}
|
||||
var loggerMap map[string]Logger = map[string]Logger{}
|
||||
var appenderFactoryMap map[string]func(LogAppenderConfig) LoggerAppender = map[string]func(LogAppenderConfig) LoggerAppender{}
|
||||
var appenders map[string]LoggerAppender = map[string]LoggerAppender{}
|
||||
var loggerMap map[string]*Logger = map[string]*Logger{}
|
||||
var appenderFactoryMap map[string]func(LogAppenderConfig) *LoggerAppender = map[string]func(LogAppenderConfig) *LoggerAppender{}
|
||||
var appenders map[string]*LoggerAppender = map[string]*LoggerAppender{}
|
||||
var loggerConfig LoggersConfig
|
||||
|
||||
type LogAppenderConfig struct {
|
||||
|
@ -43,7 +43,7 @@ type LoggersConfig struct {
|
|||
type Logger struct {
|
||||
category string
|
||||
level int
|
||||
appenders []LoggerAppender
|
||||
appenders []*LoggerAppender
|
||||
}
|
||||
|
||||
type LogEvent struct {
|
||||
|
@ -62,7 +62,7 @@ var consoleAppender LoggerAppender = &ConsoleAppender{}
|
|||
var defaultLogger = &Logger{
|
||||
|
||||
level: Error,
|
||||
appenders: []LoggerAppender{consoleAppender},
|
||||
appenders: []*LoggerAppender{&consoleAppender},
|
||||
}
|
||||
|
||||
func (l *Logger) log(Level int, msg []interface{}) {
|
||||
|
@ -71,7 +71,7 @@ func (l *Logger) log(Level int, msg []interface{}) {
|
|||
now := time.Now()
|
||||
logEvent := LogEvent{l.category, now, Level, msg}
|
||||
for _, appender := range l.appenders {
|
||||
appender.Append(logEvent)
|
||||
(*appender).Append(logEvent)
|
||||
}
|
||||
// l.Appender.Append(logEvent)
|
||||
// fmt.Println(now.Format("2006-01-02 15:04:05"), " ", l.Name, ": ", msg)
|
||||
|
@ -97,7 +97,7 @@ func (l *Logger) Debug(msg ...interface{}) {
|
|||
func (l *Logger) Trace(msg ...interface{}) {
|
||||
l.log(Trace, msg)
|
||||
}
|
||||
func GetLogger(name string) Logger {
|
||||
func GetLogger(name string) *Logger {
|
||||
if logger, ok := loggerMap[name]; ok {
|
||||
return logger
|
||||
} else {
|
||||
|
@ -106,29 +106,30 @@ func GetLogger(name string) Logger {
|
|||
return makeLogger(name, logConfig)
|
||||
}
|
||||
if name == "default" {
|
||||
return *defaultLogger
|
||||
return defaultLogger
|
||||
}
|
||||
ret := GetLogger("default")
|
||||
ret.category = name
|
||||
return ret
|
||||
l := *GetLogger("default")
|
||||
l.category = name
|
||||
loggerMap[name] = &l
|
||||
return &l
|
||||
}
|
||||
}
|
||||
|
||||
func makeLogger(name string, config LogConfig) Logger {
|
||||
func makeLogger(name string, config LogConfig) *Logger {
|
||||
logger := &Logger{category: name}
|
||||
levelstr := strings.ToLower(config.Level)
|
||||
logger.level = logLevelMap[levelstr]
|
||||
|
||||
if config.Appenders == nil || len(config.Appenders) == 0 {
|
||||
logger.appenders = []LoggerAppender{consoleAppender}
|
||||
logger.appenders = []*LoggerAppender{&consoleAppender}
|
||||
} else {
|
||||
logger.appenders = make([]LoggerAppender, len(config.Appenders))
|
||||
logger.appenders = make([]*LoggerAppender, len(config.Appenders))
|
||||
for i, appenderName := range config.Appenders {
|
||||
logger.appenders[i] = appenders[appenderName]
|
||||
}
|
||||
}
|
||||
loggerMap[name] = *logger
|
||||
return *logger
|
||||
loggerMap[name] = logger
|
||||
return logger
|
||||
}
|
||||
func Configure(config LoggersConfig) {
|
||||
loggerConfig = config
|
||||
|
@ -137,7 +138,7 @@ func Configure(config LoggersConfig) {
|
|||
if ok {
|
||||
appenders[name] = appenderFactory(appenderConfig)
|
||||
} else {
|
||||
appenders[name] = &ConsoleAppender{}
|
||||
appenders[name] = &consoleAppender
|
||||
}
|
||||
}
|
||||
for name, _ := range loggerConfig.Categories {
|
||||
|
@ -145,7 +146,7 @@ func Configure(config LoggersConfig) {
|
|||
}
|
||||
}
|
||||
|
||||
func RegistAppender(typeName string, appenderCreatCb func(LogAppenderConfig) LoggerAppender) {
|
||||
func RegistAppender(typeName string, appenderCreatCb func(LogAppenderConfig) *LoggerAppender) {
|
||||
|
||||
appenderFactoryMap[typeName] = appenderCreatCb
|
||||
}
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
// TestGetLogger tests the GetLogger function
|
||||
package gologger
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestGetLogger(t *testing.T) {
|
||||
// Initialize loggerMap and loggerConfig
|
||||
|
||||
dl := GetLogger("default")
|
||||
if dl != defaultLogger {
|
||||
t.Errorf("GetLogger(\"defult\") should return defaultLogger")
|
||||
}
|
||||
|
||||
al := GetLogger("app")
|
||||
|
||||
if al == dl {
|
||||
t.Errorf("GetLogger(\"app\") should return a new logger")
|
||||
}
|
||||
|
||||
al2 := GetLogger("app")
|
||||
|
||||
if al2 != al {
|
||||
t.Errorf("GetLogger(\"app\") should return the same logger")
|
||||
}
|
||||
|
||||
}
|
|
@ -40,4 +40,5 @@ func main() {
|
|||
defaultLogger.Debug("debug again")
|
||||
fatLogger.Debug("debug again")
|
||||
fatLogger.Error("This is error")
|
||||
select {}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue