Revert "logs:default support fileline"
This reverts commit 1f268526.
Showing
5 changed files
with
33 additions
and
4 deletions
| ... | @@ -38,6 +38,11 @@ func SetLevel(l int) { | ... | @@ -38,6 +38,11 @@ func SetLevel(l int) { |
| 38 | BeeLogger.SetLevel(l) | 38 | BeeLogger.SetLevel(l) |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | func SetLogFuncCall(b bool) { | ||
| 42 | BeeLogger.EnableFuncCallDepth(b) | ||
| 43 | BeeLogger.SetLogFuncCallDepth(3) | ||
| 44 | } | ||
| 45 | |||
| 41 | // logger references the used application logger. | 46 | // logger references the used application logger. |
| 42 | var BeeLogger *logs.BeeLogger | 47 | var BeeLogger *logs.BeeLogger |
| 43 | 48 | ... | ... |
| ... | @@ -99,7 +99,7 @@ func (c *ConnWriter) connect() error { | ... | @@ -99,7 +99,7 @@ func (c *ConnWriter) connect() error { |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | c.innerWriter = conn | 101 | c.innerWriter = conn |
| 102 | c.lg = log.New(conn, "", log.Ldate|log.Ltime|log.Lshortfile) | 102 | c.lg = log.New(conn, "", log.Ldate|log.Ltime) |
| 103 | return nil | 103 | return nil |
| 104 | } | 104 | } |
| 105 | 105 | ... | ... |
| ... | @@ -51,7 +51,7 @@ type ConsoleWriter struct { | ... | @@ -51,7 +51,7 @@ type ConsoleWriter struct { |
| 51 | // create ConsoleWriter returning as LoggerInterface. | 51 | // create ConsoleWriter returning as LoggerInterface. |
| 52 | func NewConsole() LoggerInterface { | 52 | func NewConsole() LoggerInterface { |
| 53 | cw := new(ConsoleWriter) | 53 | cw := new(ConsoleWriter) |
| 54 | cw.lg = log.New(os.Stdout, "", log.Ldate|log.Ltime|log.Lshortfile) | 54 | cw.lg = log.New(os.Stdout, "", log.Ldate|log.Ltime) |
| 55 | cw.Level = LevelDebug | 55 | cw.Level = LevelDebug |
| 56 | return cw | 56 | return cw |
| 57 | } | 57 | } | ... | ... |
| ... | @@ -89,7 +89,7 @@ func NewFileWriter() LoggerInterface { | ... | @@ -89,7 +89,7 @@ func NewFileWriter() LoggerInterface { |
| 89 | // use MuxWriter instead direct use os.File for lock write when rotate | 89 | // use MuxWriter instead direct use os.File for lock write when rotate |
| 90 | w.mw = new(MuxWriter) | 90 | w.mw = new(MuxWriter) |
| 91 | // set MuxWriter as Logger's io.Writer | 91 | // set MuxWriter as Logger's io.Writer |
| 92 | w.Logger = log.New(w.mw, "", log.Ldate|log.Ltime|log.Lshortfile) | 92 | w.Logger = log.New(w.mw, "", log.Ldate|log.Ltime) |
| 93 | return w | 93 | return w |
| 94 | } | 94 | } |
| 95 | 95 | ... | ... |
| ... | @@ -34,7 +34,8 @@ package logs | ... | @@ -34,7 +34,8 @@ package logs |
| 34 | 34 | ||
| 35 | import ( | 35 | import ( |
| 36 | "fmt" | 36 | "fmt" |
| 37 | 37 | "path" | |
| 38 | "runtime" | ||
| 38 | "sync" | 39 | "sync" |
| 39 | ) | 40 | ) |
| 40 | 41 | ||
| ... | @@ -89,6 +90,8 @@ func Register(name string, log loggerType) { | ... | @@ -89,6 +90,8 @@ func Register(name string, log loggerType) { |
| 89 | type BeeLogger struct { | 90 | type BeeLogger struct { |
| 90 | lock sync.Mutex | 91 | lock sync.Mutex |
| 91 | level int | 92 | level int |
| 93 | enableFuncCallDepth bool | ||
| 94 | loggerFuncCallDepth int | ||
| 92 | msg chan *logMsg | 95 | msg chan *logMsg |
| 93 | outputs map[string]LoggerInterface | 96 | outputs map[string]LoggerInterface |
| 94 | } | 97 | } |
| ... | @@ -104,6 +107,7 @@ type logMsg struct { | ... | @@ -104,6 +107,7 @@ type logMsg struct { |
| 104 | func NewLogger(channellen int64) *BeeLogger { | 107 | func NewLogger(channellen int64) *BeeLogger { |
| 105 | bl := new(BeeLogger) | 108 | bl := new(BeeLogger) |
| 106 | bl.level = LevelDebug | 109 | bl.level = LevelDebug |
| 110 | bl.loggerFuncCallDepth = 2 | ||
| 107 | bl.msg = make(chan *logMsg, channellen) | 111 | bl.msg = make(chan *logMsg, channellen) |
| 108 | bl.outputs = make(map[string]LoggerInterface) | 112 | bl.outputs = make(map[string]LoggerInterface) |
| 109 | //bl.SetLogger("console", "") // default output to console | 113 | //bl.SetLogger("console", "") // default output to console |
| ... | @@ -149,7 +153,17 @@ func (bl *BeeLogger) writerMsg(loglevel int, msg string) error { | ... | @@ -149,7 +153,17 @@ func (bl *BeeLogger) writerMsg(loglevel int, msg string) error { |
| 149 | } | 153 | } |
| 150 | lm := new(logMsg) | 154 | lm := new(logMsg) |
| 151 | lm.level = loglevel | 155 | lm.level = loglevel |
| 156 | if bl.enableFuncCallDepth { | ||
| 157 | _, file, line, ok := runtime.Caller(bl.loggerFuncCallDepth) | ||
| 158 | if ok { | ||
| 159 | _, filename := path.Split(file) | ||
| 160 | lm.msg = fmt.Sprintf("[%s:%d] %s", filename, line, msg) | ||
| 161 | } else { | ||
| 162 | lm.msg = msg | ||
| 163 | } | ||
| 164 | } else { | ||
| 152 | lm.msg = msg | 165 | lm.msg = msg |
| 166 | } | ||
| 153 | bl.msg <- lm | 167 | bl.msg <- lm |
| 154 | return nil | 168 | return nil |
| 155 | } | 169 | } |
| ... | @@ -162,6 +176,16 @@ func (bl *BeeLogger) SetLevel(l int) { | ... | @@ -162,6 +176,16 @@ func (bl *BeeLogger) SetLevel(l int) { |
| 162 | bl.level = l | 176 | bl.level = l |
| 163 | } | 177 | } |
| 164 | 178 | ||
| 179 | // set log funcCallDepth | ||
| 180 | func (bl *BeeLogger) SetLogFuncCallDepth(d int) { | ||
| 181 | bl.loggerFuncCallDepth = d | ||
| 182 | } | ||
| 183 | |||
| 184 | // enable log funcCallDepth | ||
| 185 | func (bl *BeeLogger) EnableFuncCallDepth(b bool) { | ||
| 186 | bl.enableFuncCallDepth = b | ||
| 187 | } | ||
| 188 | |||
| 165 | // start logger chan reading. | 189 | // start logger chan reading. |
| 166 | // when chan is not empty, write logs. | 190 | // when chan is not empty, write logs. |
| 167 | func (bl *BeeLogger) startLogger() { | 191 | func (bl *BeeLogger) startLogger() { | ... | ... |
-
Please register or sign in to post a comment