lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-26 07:01:28 +00:00
Code Issues Releases Activity

refactor writeMsg function

Browse Source
This commit is contained in:
JessonChan 2016-03-24 18:21:52 +08:00
parent 8344a60552
commit 0814eefa62
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
logs/es/es.go
View File

@ -76,5 +76,5 @@ func (el *esLogger) Flush() {
} }
func init() { func init() {
logs.Register(logs.AdaterEs, NewES) logs.Register(logs.AdapterEs, NewES)
} }

20
logs/log.go
View File

@ -56,14 +56,16 @@ const (
LevelInformational LevelInformational
LevelDebug LevelDebug
) )
const levelCustom = -1
// Name for adapter with beego official support
const ( const (
AdapterConsole = "console" AdapterConsole = "console"
AdapterFile = "file" AdapterFile = "file"
AdapterMultiFile = "multifile" AdapterMultiFile = "multifile"
AdapterMail = "stmp" AdapterMail = "stmp"
AdapterConn = "conn" AdapterConn = "conn"
AdaterEs = "es" AdapterEs = "es"
) )
// Legacy loglevel constants to ensure backwards compatibility. // Legacy loglevel constants to ensure backwards compatibility.
@ -75,7 +77,7 @@ const (
LevelWarn = LevelWarning LevelWarn = LevelWarning
) )
type loggerType func() Logger type newLoggerFunc func() Logger
// Logger defines the behavior of a log provider. // Logger defines the behavior of a log provider.
type Logger interface { type Logger interface {
@ -85,12 +87,13 @@ type Logger interface {
Flush() Flush()
} }
var adapters = make(map[string]loggerType) var adapters = make(map[string]newLoggerFunc)
var levelPrefix = [LevelDebug + 1]string{"[M] ", "[A] ", "[C] ", "[E] ", "[W] ", "[N] ", "[I] ", "[D] "}
// Register makes a log provide available by the provided name. // Register makes a log provide available by the provided name.
// If Register is called twice with the same name or if driver is nil, // If Register is called twice with the same name or if driver is nil,
// it panics. // it panics.
func Register(name string, log loggerType) { func Register(name string, log newLoggerFunc) {
if log == nil { if log == nil {
panic("logs: Register provide is nil") panic("logs: Register provide is nil")
} }
@ -222,14 +225,18 @@ func (bl *BeeLogger) Write(p []byte) (n int, err error) {
p = p[0 : len(p)-1] p = p[0 : len(p)-1]
} }
// set LevelCritical to ensure all log message will be write out // set LevelCritical to ensure all log message will be write out
err = bl.writeMsg(LevelCritical, string(p)) err = bl.writeMsg(levelCustom, string(p))
if err == nil { if err == nil {
return len(p), err return len(p), err
} }
return 0, err return 0, err
} }
func (bl *BeeLogger) writeMsg(logLevel int, msg string) error { func (bl *BeeLogger) writeMsg(logLevel int, msg string, v ...interface{}) error {
if logLevel != levelCustom {
msg = levelPrefix[logLevel] + msg
}
msg = fmt.Sprintf(msg, v...)
when := time.Now() when := time.Now()
if bl.enableFuncCallDepth { if bl.enableFuncCallDepth {
_, file, line, ok := runtime.Caller(bl.loggerFuncCallDepth) _, file, line, ok := runtime.Caller(bl.loggerFuncCallDepth)
@ -561,7 +568,6 @@ func Informational(f interface{}, v ...interface{}) {
// Info compatibility alias for Warning() // Info compatibility alias for Warning()
func Info(f interface{}, v ...interface{}) { func Info(f interface{}, v ...interface{}) {
fmt.Print()
beeLogger.Info(formatLog(f, v...)) beeLogger.Info(formatLog(f, v...))
} }