go-4devs/log
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

add bracket format #15

Merged
andrey merged 5 commits from bracket into master 2024-01-03 21:35:22 +03:00
Conversation 0 Commits 5 Files Changed 11 +9 -2
6 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 52ae0b3124 - Show all commits

1
global.go
View File

@@ -12,7 +12,6 @@ import (
//nolint:gochecknoglobals,gomnd //nolint:gochecknoglobals,gomnd
var global = With(New(), var global = With(New(),
WithTime(KeyTime, time.RFC3339), WithTime(KeyTime, time.RFC3339),
WithSource(2, TrimPath),
WithLevel(KeyLevel, level.Debug), WithLevel(KeyLevel, level.Debug),
WithExit(level.Alert), WithExit(level.Alert),
WithPanic(level.Emergency), WithPanic(level.Emergency),

2
handler/logrus/logger.go
View File

@@ -11,11 +11,13 @@ import (
) )
// Standard create new standart logrus handler. // Standard create new standart logrus handler.
// Deprecated: delete after 0.7.0
func Standard() log.Logger { func Standard() log.Logger {
return New(logrus.StandardLogger()) return New(logrus.StandardLogger())
} }
// New create new logrus handler. // New create new logrus handler.
// Deprecated: delete after 0.7.0
func New(log *logrus.Logger) log.Logger { func New(log *logrus.Logger) log.Logger {
return func(ctx context.Context, data *entry.Entry) (int, error) { return func(ctx context.Context, data *entry.Entry) (int, error) {
lrgFields := make(logrus.Fields, data.Fields().Len()) lrgFields := make(logrus.Fields, data.Fields().Len())

1
handler/otel/logger.go
View File

@@ -7,6 +7,7 @@ import (
"gitoa.ru/go-4devs/log/entry" "gitoa.ru/go-4devs/log/entry"
) )
// Deprecated: delete after 0.7.0
func New() log.Logger { func New() log.Logger {
return func(ctx context.Context, e *entry.Entry) (int, error) { return func(ctx context.Context, e *entry.Entry) (int, error) {
addEvent(ctx, e) addEvent(ctx, e)

1
handler/otel/middleware.go
View File

@@ -7,6 +7,7 @@ import (
"gitoa.ru/go-4devs/log/entry" "gitoa.ru/go-4devs/log/entry"
) )
// Deprecated: delete after 0.7.0
func Middleware() log.Middleware { func Middleware() log.Middleware {
return func(ctx context.Context, e *entry.Entry, handler log.Logger) (int, error) { return func(ctx context.Context, e *entry.Entry, handler log.Logger) (int, error) {
addEvent(ctx, e) addEvent(ctx, e)

4
handler/zap/logger.go
View File

@@ -10,14 +10,17 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
) )
// Deprecated: delete after 0.7.0
func Nop() log.Logger { func Nop() log.Logger {
return New(zap.NewNop()) return New(zap.NewNop())
} }
// Deprecated: delete after 0.7.0
func Example(options ...zap.Option) log.Logger { func Example(options ...zap.Option) log.Logger {
return New(zap.NewExample(options...)) return New(zap.NewExample(options...))
} }
// Deprecated: delete after 0.7.0
func Production(options ...zap.Option) log.Logger { func Production(options ...zap.Option) log.Logger {
z, err := zap.NewProduction(options...) z, err := zap.NewProduction(options...)
if err != nil { if err != nil {
@@ -27,6 +30,7 @@ func Production(options ...zap.Option) log.Logger {
return New(z) return New(z)
} }
// Deprecated: delete after 0.7.0
func Development(options ...zap.Option) log.Logger { func Development(options ...zap.Option) log.Logger {
z, err := zap.NewDevelopment(options...) z, err := zap.NewDevelopment(options...)
if err != nil { if err != nil {

2
writer_example_test.go
View File

@@ -22,7 +22,7 @@ func ExampleFormatWithBracket() {
ctx := context.Background() ctx := context.Background()
logger := log.New(log.WithFormat(log.FormatWithBracket()), log.WithStdout()).With( logger := log.New(log.WithFormat(log.FormatWithBracket()), log.WithStdout()).With(
log.WithSource(10, filepath.Base), log.WithSource(10, filepath.Base),
exampleWithTime(log.KeyTime, time.RFC3339), //log.WithTime(log.KeyTime, time.RFC3339),
log.WithLevel(log.KeyLevel, level.Info), log.WithLevel(log.KeyLevel, level.Info),
) )