go/go-micro
1
0
Fork 0
mirror of https://github.com/go-micro/go-micro.git synced 2025-08-10 21:52:01 +02:00
Code Issues Releases Activity

logger: caller's skip correction (#2280)

Browse Source
This commit is contained in:
Arsen
2021-09-22 11:01:03 +03:00
committed by GitHub
parent b8fbe87e1f
commit 916ed6b8ee
6 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
logger/helper.go
View File

@@ -6,11 +6,11 @@ import (
)
type Helper struct {
Logger
logger Logger
}
func NewHelper(log Logger) *Helper {
return &Helper{Logger: log}
func NewHelper(logger Logger) *Helper {
return &Helper{logger: logger}
}
// Extract always returns valid Helper with logger from context or with DefaultLogger as fallback.
@@ -24,96 +24,104 @@ func Extract(ctx context.Context) *Helper {
return NewHelper(DefaultLogger)
}
func (h *Helper) Log(level Level, args ...interface{}) {
h.logger.Log(level, args...)
}
func (h *Helper) Logf(level Level, template string, args ...interface{}) {
h.logger.Logf(level, template, args...)
}
func (h *Helper) Info(args ...interface{}) {
if !h.Logger.Options().Level.Enabled(InfoLevel) {
if !h.logger.Options().Level.Enabled(InfoLevel) {
return
}
h.Log(InfoLevel, args...)
h.logger.Log(InfoLevel, args...)
}
func (h *Helper) Infof(template string, args ...interface{}) {
if !h.Logger.Options().Level.Enabled(InfoLevel) {
if !h.logger.Options().Level.Enabled(InfoLevel) {
return
}
h.Logf(InfoLevel, template, args...)
h.logger.Logf(InfoLevel, template, args...)
}
func (h *Helper) Trace(args ...interface{}) {
if !h.Logger.Options().Level.Enabled(TraceLevel) {
if !h.logger.Options().Level.Enabled(TraceLevel) {
return
}
h.Log(TraceLevel, args...)
h.logger.Log(TraceLevel, args...)
}
func (h *Helper) Tracef(template string, args ...interface{}) {
if !h.Logger.Options().Level.Enabled(TraceLevel) {
if !h.logger.Options().Level.Enabled(TraceLevel) {
return
}
h.Logf(TraceLevel, template, args...)
h.logger.Logf(TraceLevel, template, args...)
}
func (h *Helper) Debug(args ...interface{}) {
if !h.Logger.Options().Level.Enabled(DebugLevel) {
if !h.logger.Options().Level.Enabled(DebugLevel) {
return
}
h.Log(DebugLevel, args...)
h.logger.Log(DebugLevel, args...)
}
func (h *Helper) Debugf(template string, args ...interface{}) {
if !h.Logger.Options().Level.Enabled(DebugLevel) {
if !h.logger.Options().Level.Enabled(DebugLevel) {
return
}
h.Logf(DebugLevel, template, args...)
h.logger.Logf(DebugLevel, template, args...)
}
func (h *Helper) Warn(args ...interface{}) {
if !h.Logger.Options().Level.Enabled(WarnLevel) {
if !h.logger.Options().Level.Enabled(WarnLevel) {
return
}
h.Log(WarnLevel, args...)
h.logger.Log(WarnLevel, args...)
}
func (h *Helper) Warnf(template string, args ...interface{}) {
if !h.Logger.Options().Level.Enabled(WarnLevel) {
if !h.logger.Options().Level.Enabled(WarnLevel) {
return
}
h.Logf(WarnLevel, template, args...)
h.logger.Logf(WarnLevel, template, args...)
}
func (h *Helper) Error(args ...interface{}) {
if !h.Logger.Options().Level.Enabled(ErrorLevel) {
if !h.logger.Options().Level.Enabled(ErrorLevel) {
return
}
h.Log(ErrorLevel, args...)
h.logger.Log(ErrorLevel, args...)
}
func (h *Helper) Errorf(template string, args ...interface{}) {
if !h.Logger.Options().Level.Enabled(ErrorLevel) {
if !h.logger.Options().Level.Enabled(ErrorLevel) {
return
}
h.Logf(ErrorLevel, template, args...)
h.logger.Logf(ErrorLevel, template, args...)
}
func (h *Helper) Fatal(args ...interface{}) {
if !h.Logger.Options().Level.Enabled(FatalLevel) {
if !h.logger.Options().Level.Enabled(FatalLevel) {
return
}
h.Log(FatalLevel, args...)
h.logger.Log(FatalLevel, args...)
os.Exit(1)
}
func (h *Helper) Fatalf(template string, args ...interface{}) {
if !h.Logger.Options().Level.Enabled(FatalLevel) {
if !h.logger.Options().Level.Enabled(FatalLevel) {
return
}
h.Logf(FatalLevel, template, args...)
h.logger.Logf(FatalLevel, template, args...)
os.Exit(1)
}
func (h *Helper) WithError(err error) *Helper {
return &Helper{Logger: h.Logger.Fields(map[string]interface{}{"error": err})}
return &Helper{logger: h.logger.Fields(map[string]interface{}{"error": err})}
}
func (h *Helper) WithFields(fields map[string]interface{}) *Helper {
return &Helper{Logger: h.Logger.Fields(fields)}
return &Helper{logger: h.logger.Fields(fields)}
}