foomo/keel
1
0
Fork 0
mirror of https://github.com/foomo/keel.git synced 2025-10-16 12:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: prevent nil access

Browse Source
This commit is contained in:
franklin 2021-09-08 16:31:00 +02:00
parent 2ac71d4384
commit f063345ed5
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
log/with.go
View File

@ -13,21 +13,28 @@ import (
httputils "github.com/foomo/keel/net/http" httputils "github.com/foomo/keel/net/http"
) )
func With(l *zap.Logger, fields ...zap.Field) *zap.Logger {
if l == nil {
l = Logger()
}
return l.With(fields...)
}
func WithError(l *zap.Logger, err error) *zap.Logger { func WithError(l *zap.Logger, err error) *zap.Logger {
return l.With(FError(err)) return With(l, FError(err))
} }
func WithHTTPServerName(l *zap.Logger, name string) *zap.Logger { func WithHTTPServerName(l *zap.Logger, name string) *zap.Logger {
return l.With(FHTTPServerName(name)) return With(l, FHTTPServerName(name))
} }
func WithServiceName(l *zap.Logger, name string) *zap.Logger { func WithServiceName(l *zap.Logger, name string) *zap.Logger {
return l.With(FServiceName(name)) return With(l, FServiceName(name))
} }
func WithTraceID(l *zap.Logger, ctx context.Context) *zap.Logger { func WithTraceID(l *zap.Logger, ctx context.Context) *zap.Logger {
if spanCtx := trace.SpanContextFromContext(ctx); spanCtx.IsValid() { if spanCtx := trace.SpanContextFromContext(ctx); spanCtx.IsValid() {
l = l.With(FTraceID(spanCtx.TraceID().String())) l = With(l, FTraceID(spanCtx.TraceID().String()))
} }
return l return l
} }
@ -82,5 +89,5 @@ func WithHTTPRequest(l *zap.Logger, r *http.Request) *zap.Logger {
fields = append(fields, FTraceID(spanCtx.TraceID().String())) fields = append(fields, FTraceID(spanCtx.TraceID().String()))
} }
return l.With(fields...) return With(l, fields...)
} }