Compare commits
8 Commits
9cd8f95c73
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 9ccc7030f2 | |||
| 9f8f38e43f | |||
| 859a8d88f7 | |||
| 4baf4b36e7 | |||
|
|
2fd0c1f9ec | ||
| c7090b5067 | |||
|
|
16d3e04fd9 | ||
| 57a908f894 |
79
.drone.yml
79
.drone.yml
@@ -5,7 +5,7 @@ name: logger
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: test
|
- name: test
|
||||||
image: golang:1.21.5
|
image: golang:1.22.2
|
||||||
volumes:
|
volumes:
|
||||||
- name: deps
|
- name: deps
|
||||||
path: /go/src/mod
|
path: /go/src/mod
|
||||||
@@ -13,85 +13,10 @@ steps:
|
|||||||
- go test
|
- go test
|
||||||
|
|
||||||
- name: golangci-lint
|
- name: golangci-lint
|
||||||
image: golangci/golangci-lint:v1.55
|
image: golangci/golangci-lint:v1.57
|
||||||
commands:
|
commands:
|
||||||
- golangci-lint run
|
- golangci-lint run
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: deps
|
- name: deps
|
||||||
temp: {}
|
temp: {}
|
||||||
|
|
||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: docker
|
|
||||||
name: otel
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: test
|
|
||||||
image: golang:1.21.5
|
|
||||||
volumes:
|
|
||||||
- name: deps
|
|
||||||
path: /go/src/mod
|
|
||||||
commands:
|
|
||||||
- cd handler/otel
|
|
||||||
- go test
|
|
||||||
|
|
||||||
- name: golangci-lint
|
|
||||||
image: golangci/golangci-lint:v1.55
|
|
||||||
commands:
|
|
||||||
- cd handler/otel
|
|
||||||
- golangci-lint run
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
- name: deps
|
|
||||||
temp: {}
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: docker
|
|
||||||
name: logrus
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: test
|
|
||||||
image: golang:1.21.5
|
|
||||||
volumes:
|
|
||||||
- name: deps
|
|
||||||
path: /go/src/mod
|
|
||||||
commands:
|
|
||||||
- cd handler/logrus
|
|
||||||
- go test
|
|
||||||
|
|
||||||
- name: golangci-lint
|
|
||||||
image: golangci/golangci-lint:v1.55
|
|
||||||
commands:
|
|
||||||
- cd handler/logrus
|
|
||||||
- golangci-lint run
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
- name: deps
|
|
||||||
temp: {}
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: docker
|
|
||||||
name: zap
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: test
|
|
||||||
image: golang:1.21.5
|
|
||||||
volumes:
|
|
||||||
- name: deps
|
|
||||||
path: /go/src/mod
|
|
||||||
commands:
|
|
||||||
- cd handler/zap
|
|
||||||
- go test
|
|
||||||
|
|
||||||
- name: golangci-lint
|
|
||||||
image: golangci/golangci-lint:v1.55
|
|
||||||
commands:
|
|
||||||
- cd handler/zap
|
|
||||||
- golangci-lint run
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
- name: deps
|
|
||||||
temp: {}
|
|
||||||
|
|||||||
26
.gitea/workflows/goaction.yml
Normal file
26
.gitea/workflows/goaction.yml
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
name: Go Action
|
||||||
|
|
||||||
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
goaction:
|
||||||
|
runs-on: ubuntu-latest # Use a Gitea Actions runner label
|
||||||
|
steps:
|
||||||
|
- name: Check out repository code
|
||||||
|
uses: actions/checkout@v4 # Action to clone the repo
|
||||||
|
|
||||||
|
- name: Set up Go
|
||||||
|
uses: actions/setup-go@v5 # Action to install a specific Go version
|
||||||
|
with:
|
||||||
|
go-version: '1.25.5' # Specify your required Go version
|
||||||
|
|
||||||
|
- name: Run golangci-lint
|
||||||
|
uses: golangci/golangci-lint-action@v8 # Use the golangci-lint action
|
||||||
|
with:
|
||||||
|
version: v2.7.2 # Specify the linter version
|
||||||
|
# Optional: additional arguments
|
||||||
|
args: --verbose
|
||||||
|
|
||||||
|
- name: Run go test
|
||||||
|
run: go test ./...
|
||||||
|
|
||||||
118
.golangci.yml
118
.golangci.yml
@@ -1,9 +1,30 @@
|
|||||||
run:
|
version: "2"
|
||||||
timeout: 5m
|
linters:
|
||||||
|
default: all
|
||||||
|
disable:
|
||||||
|
- wsl
|
||||||
|
- noinlineerr
|
||||||
|
settings:
|
||||||
|
depguard:
|
||||||
|
rules:
|
||||||
|
main:
|
||||||
|
allow:
|
||||||
|
- $gostd
|
||||||
|
- gitoa.ru
|
||||||
|
|
||||||
linters-settings:
|
funcorder:
|
||||||
|
constructor: false
|
||||||
|
recvcheck:
|
||||||
|
disable-builtin: false
|
||||||
|
exclusions:
|
||||||
|
- "*.String"
|
||||||
|
- "*.UnmarshalText"
|
||||||
|
- "*.UnmarshalJSON"
|
||||||
|
- "*.UnmarshalBinary"
|
||||||
dupl:
|
dupl:
|
||||||
threshold: 100
|
threshold: 100
|
||||||
|
exhaustive:
|
||||||
|
default-signifies-exhaustive: true
|
||||||
funlen:
|
funlen:
|
||||||
lines: 100
|
lines: 100
|
||||||
statements: 50
|
statements: 50
|
||||||
@@ -12,64 +33,61 @@ linters-settings:
|
|||||||
min-occurrences: 2
|
min-occurrences: 2
|
||||||
gocyclo:
|
gocyclo:
|
||||||
min-complexity: 15
|
min-complexity: 15
|
||||||
govet:
|
|
||||||
check-shadowing: true
|
|
||||||
lll:
|
lll:
|
||||||
line-length: 140
|
line-length: 140
|
||||||
fieldalignment:
|
|
||||||
suggest-new: true
|
|
||||||
misspell:
|
misspell:
|
||||||
locale: US
|
locale: US
|
||||||
exhaustive:
|
tagliatelle:
|
||||||
default-signifies-exhaustive: true
|
case:
|
||||||
|
rules:
|
||||||
|
avro: snake
|
||||||
|
bson: camel
|
||||||
|
json: snake
|
||||||
|
xml: camel
|
||||||
|
yaml: camel
|
||||||
|
use-field-name: true
|
||||||
varnamelen:
|
varnamelen:
|
||||||
min-name-length: 2
|
min-name-length: 2
|
||||||
ignore-names:
|
ignore-names:
|
||||||
- err
|
- err
|
||||||
- n
|
- "n"
|
||||||
- i
|
- i
|
||||||
- w
|
- w
|
||||||
tagliatelle:
|
exclusions:
|
||||||
case:
|
generated: lax
|
||||||
use-field-name: true
|
presets:
|
||||||
|
- comments
|
||||||
|
- common-false-positives
|
||||||
|
- legacy
|
||||||
|
- std-error-handling
|
||||||
rules:
|
rules:
|
||||||
json: snake
|
- linters:
|
||||||
yaml: camel
|
|
||||||
xml: camel
|
|
||||||
bson: camel
|
|
||||||
avro: snake
|
|
||||||
|
|
||||||
linters:
|
|
||||||
enable-all: true
|
|
||||||
disable:
|
|
||||||
# deprecated
|
|
||||||
- interfacer
|
|
||||||
- structcheck
|
|
||||||
- varcheck
|
|
||||||
- golint
|
|
||||||
- deadcode
|
|
||||||
- scopelint
|
|
||||||
- exhaustivestruct
|
|
||||||
- ifshort
|
|
||||||
- nosnakecase
|
|
||||||
- maligned
|
|
||||||
|
|
||||||
- depguard # need configure
|
|
||||||
- nolintlint # use with space
|
|
||||||
|
|
||||||
issues:
|
|
||||||
# Excluding configuration per-path, per-linter, per-text and per-source
|
|
||||||
exclude-rules:
|
|
||||||
- path: _test\.go
|
|
||||||
linters:
|
|
||||||
- gomnd
|
|
||||||
- ireturn
|
|
||||||
- exhaustruct
|
- exhaustruct
|
||||||
- gochecknoglobals
|
- gochecknoglobals
|
||||||
- path: _example_test\.go
|
- ireturn
|
||||||
linters:
|
- mnd
|
||||||
|
path: _test\.go
|
||||||
|
- linters:
|
||||||
|
- err113
|
||||||
- lll
|
- lll
|
||||||
- goerr113
|
path: _example_test\.go
|
||||||
- path: example/*
|
- linters:
|
||||||
linters:
|
- lll
|
||||||
- gomnd
|
- mnd
|
||||||
|
path: example/*
|
||||||
|
paths:
|
||||||
|
- third_party$
|
||||||
|
- builtin$
|
||||||
|
- examples$
|
||||||
|
formatters:
|
||||||
|
enable:
|
||||||
|
- gci
|
||||||
|
- gofmt
|
||||||
|
- gofumpt
|
||||||
|
- goimports
|
||||||
|
exclusions:
|
||||||
|
generated: lax
|
||||||
|
paths:
|
||||||
|
- third_party$
|
||||||
|
- builtin$
|
||||||
|
- examples$
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# log
|
# log
|
||||||
|
|
||||||
[](https://drone.gitoa.ru/go-4devs/log)
|

|
||||||
[](https://goreportcard.com/report/gitoa.ru/go-4devs/log)
|
[](https://goreportcard.com/report/gitoa.ru/go-4devs/log)
|
||||||
[](http://godoc.org/gitoa.ru/go-4devs/log)
|
[](http://godoc.org/gitoa.ru/go-4devs/log)
|
||||||
|
|||||||
@@ -69,10 +69,10 @@ func getMessage(iter int) string {
|
|||||||
return _messages[iter%1000]
|
return _messages[iter%1000]
|
||||||
}
|
}
|
||||||
|
|
||||||
func fakeFmtArgs() []interface{} {
|
func fakeFmtArgs() []any {
|
||||||
// Need to keep this a function instead of a package-global var so that we
|
// Need to keep this a function instead of a package-global var so that we
|
||||||
// pay the cast-to-interface{} penalty on each call.
|
// pay the cast-to-interface{} penalty on each call.
|
||||||
return []interface{}{
|
return []any{
|
||||||
_tenInts[0],
|
_tenInts[0],
|
||||||
_tenInts,
|
_tenInts,
|
||||||
_tenStrings[0],
|
_tenStrings[0],
|
||||||
@@ -101,8 +101,8 @@ func fakeFields() []field.Field {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func fakeSugarFields() []interface{} {
|
func fakeSugarFields() []any {
|
||||||
return []interface{}{
|
return []any{
|
||||||
"int", _tenInts[0],
|
"int", _tenInts[0],
|
||||||
"ints", _tenInts,
|
"ints", _tenInts,
|
||||||
"string", _tenStrings[0],
|
"string", _tenStrings[0],
|
||||||
@@ -166,7 +166,9 @@ func BenchmarkDisabledAccumulatedContext(b *testing.B) {
|
|||||||
|
|
||||||
b.Run("4devs/log.Context", func(b *testing.B) {
|
b.Run("4devs/log.Context", func(b *testing.B) {
|
||||||
b.ResetTimer()
|
b.ResetTimer()
|
||||||
|
|
||||||
logger := NewLogger().With(log.GoVersion("goversion"))
|
logger := NewLogger().With(log.GoVersion("goversion"))
|
||||||
|
|
||||||
b.RunParallel(func(pb *testing.PB) {
|
b.RunParallel(func(pb *testing.PB) {
|
||||||
for pb.Next() {
|
for pb.Next() {
|
||||||
logger.InfoKV(ctx, getMessage(0), fakeFields()...)
|
logger.InfoKV(ctx, getMessage(0), fakeFields()...)
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
|
|
||||||
func Caller(depth int, full bool) string {
|
func Caller(depth int, full bool) string {
|
||||||
const offset = 3
|
const offset = 3
|
||||||
|
|
||||||
_, file, line, has := runtime.Caller(depth + offset)
|
_, file, line, has := runtime.Caller(depth + offset)
|
||||||
|
|
||||||
if !has {
|
if !has {
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ func WithMessage(msg string) Option {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func WithMessagef(format string, args ...interface{}) Option {
|
func WithMessagef(format string, args ...any) Option {
|
||||||
return func(e *Entry) {
|
return func(e *Entry) {
|
||||||
e.format = format
|
e.format = format
|
||||||
e.args = args
|
e.args = args
|
||||||
@@ -50,7 +50,7 @@ func New(opts ...Option) *Entry {
|
|||||||
fields: make(field.Fields, 0, defaultCap+1),
|
fields: make(field.Fields, 0, defaultCap+1),
|
||||||
level: level.Debug,
|
level: level.Debug,
|
||||||
format: "",
|
format: "",
|
||||||
args: make([]interface{}, 0, defaultCap+1),
|
args: make([]any, 0, defaultCap+1),
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, opt := range opts {
|
for _, opt := range opts {
|
||||||
@@ -63,7 +63,7 @@ func New(opts ...Option) *Entry {
|
|||||||
// Entry slice field.
|
// Entry slice field.
|
||||||
type Entry struct {
|
type Entry struct {
|
||||||
format string
|
format string
|
||||||
args []interface{}
|
args []any
|
||||||
level level.Level
|
level level.Level
|
||||||
fields field.Fields
|
fields field.Fields
|
||||||
}
|
}
|
||||||
@@ -133,7 +133,7 @@ func (e *Entry) SetMessage(msg string) *Entry {
|
|||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *Entry) SetMessagef(format string, args ...interface{}) *Entry {
|
func (e *Entry) SetMessagef(format string, args ...any) *Entry {
|
||||||
if e == nil {
|
if e == nil {
|
||||||
return New().SetMessagef(format, args...)
|
return New().SetMessagef(format, args...)
|
||||||
}
|
}
|
||||||
@@ -154,7 +154,7 @@ func (e *Entry) Add(fields ...field.Field) *Entry {
|
|||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *Entry) AddAny(key string, value interface{}) *Entry {
|
func (e *Entry) AddAny(key string, value any) *Entry {
|
||||||
return e.Add(field.Any(key, value))
|
return e.Add(field.Any(key, value))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import "sync"
|
|||||||
|
|
||||||
//nolint:gochecknoglobals
|
//nolint:gochecknoglobals
|
||||||
var pool = sync.Pool{
|
var pool = sync.Pool{
|
||||||
New: func() interface{} {
|
New: func() any {
|
||||||
return New()
|
return New()
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"time"
|
||||||
|
|
||||||
"gitoa.ru/go-4devs/log"
|
"gitoa.ru/go-4devs/log"
|
||||||
"gitoa.ru/go-4devs/log/field"
|
"gitoa.ru/go-4devs/log/field"
|
||||||
@@ -16,9 +17,13 @@ func main() {
|
|||||||
log.Err(ctx, "error message", 42)
|
log.Err(ctx, "error message", 42)
|
||||||
service(ctx, log.Log())
|
service(ctx, log.Log())
|
||||||
|
|
||||||
logger := log.New(log.WithJSONFormat()).With(log.WithSource(10, log.TrimPath))
|
logger := log.New(log.WithJSONFormat()).With(log.WithSource(10, log.TrimPath), log.WithTime(log.KeyTime, time.RFC3339))
|
||||||
logger.AlertKV(ctx, "alert message new logger", field.String("string", "value"))
|
logger.AlertKV(ctx, "alert message new logger", field.String("string", "value"))
|
||||||
service(ctx, logger)
|
service(ctx, logger)
|
||||||
|
|
||||||
|
strLogger := log.New(log.WithFormat(log.FormatWithBracket(field.NewEncoderText()))).With(log.WithSource(10, log.TrimPath), log.WithTime(log.KeyTime, time.RFC3339))
|
||||||
|
strLogger.AlertKV(ctx, "alert message new txt logger", field.String("string", "value"))
|
||||||
|
service(ctx, strLogger)
|
||||||
}
|
}
|
||||||
|
|
||||||
func service(ctx context.Context, logger log.Logger) {
|
func service(ctx context.Context, logger log.Logger) {
|
||||||
|
|||||||
2
field.go
2
field.go
@@ -5,7 +5,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// Field create field.
|
// Field create field.
|
||||||
func Field(key string, value interface{}) field.Field {
|
func Field(key string, value any) field.Field {
|
||||||
return field.Any(key, value)
|
return field.Any(key, value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
279
field/encoder.go
279
field/encoder.go
@@ -1,4 +1,3 @@
|
|||||||
//nolint:gomnd
|
|
||||||
package field
|
package field
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -104,7 +103,147 @@ func (b BaseEncoder) AppendDelimiter(dst []byte, deli byte) []byte {
|
|||||||
return append(dst, deli)
|
return append(dst, deli)
|
||||||
}
|
}
|
||||||
|
|
||||||
//nolint:gocyclo,cyclop
|
func (b BaseEncoder) AppendDuration(dst []byte, d time.Duration) []byte {
|
||||||
|
return b.AppendString(dst, d.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b BaseEncoder) AppendTime(dst []byte, t time.Time) []byte {
|
||||||
|
return b.AppendString(dst, t.Format(b.timeFormat))
|
||||||
|
}
|
||||||
|
|
||||||
|
func AppendString(dst []byte, in string) []byte {
|
||||||
|
if needsQuoting(in) {
|
||||||
|
return strconv.AppendQuote(dst, in)
|
||||||
|
}
|
||||||
|
|
||||||
|
return append(dst, in...)
|
||||||
|
}
|
||||||
|
|
||||||
|
//nolint:cyclop
|
||||||
|
func needsQuoting(in string) bool {
|
||||||
|
if len(in) == 0 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := 0; i < len(in); {
|
||||||
|
char := in[i]
|
||||||
|
if char < utf8.RuneSelf {
|
||||||
|
// Quote anything except a backslash that would need quoting in a
|
||||||
|
// JSON string, as well as space and '='
|
||||||
|
if char != '\\' && (char == ' ' || char == '=' || !safeSet[char]) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
i++
|
||||||
|
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
decodeRune, size := utf8.DecodeRuneInString(in[i:])
|
||||||
|
if decodeRune == utf8.RuneError || unicode.IsSpace(decodeRune) || !unicode.IsPrint(decodeRune) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
i += size
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b BaseEncoder) AppendField(dst []byte, field Field) []byte {
|
||||||
|
prefix := ""
|
||||||
|
|
||||||
|
if len(dst) != 0 {
|
||||||
|
prew := dst[len(dst)-1]
|
||||||
|
if prew != '{' && prew != '.' {
|
||||||
|
prefix = string(b.group.deli)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return b.appendField(dst, field, prefix, b.delimeter)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b BaseEncoder) AppendKey(dst []byte, key string, prefix string) []byte {
|
||||||
|
if prefix != "" {
|
||||||
|
dst = append(dst, prefix...)
|
||||||
|
}
|
||||||
|
|
||||||
|
return b.AppendString(dst, key)
|
||||||
|
}
|
||||||
|
|
||||||
|
//nolint:mnd
|
||||||
|
func (b BaseEncoder) AppendComplex(dst []byte, c complex128) []byte {
|
||||||
|
cmplx := strconv.FormatComplex(c, 'g', -1, 128)
|
||||||
|
|
||||||
|
return b.AppendString(dst, cmplx)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b BaseEncoder) AppendFloat(dst []byte, f float64, bitSize int) []byte {
|
||||||
|
return strconv.AppendFloat(dst, f, 'g', -1, bitSize)
|
||||||
|
}
|
||||||
|
|
||||||
|
//nolint:mnd
|
||||||
|
func (b BaseEncoder) AppendUint(dst []byte, u uint64) []byte {
|
||||||
|
return strconv.AppendUint(dst, u, 10)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b BaseEncoder) AppendNull(dst []byte) []byte {
|
||||||
|
return append(dst, b.nullValue...)
|
||||||
|
}
|
||||||
|
|
||||||
|
//nolint:mnd
|
||||||
|
func (b BaseEncoder) AppendInt(dst []byte, val int64) []byte {
|
||||||
|
return strconv.AppendInt(dst, val, 10)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b BaseEncoder) AppendBool(dst []byte, val bool) []byte {
|
||||||
|
return strconv.AppendBool(dst, val)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b BaseEncoder) AppendGroup(dst []byte, fields []Field) []byte {
|
||||||
|
dst = append(dst, b.group.start)
|
||||||
|
dst = b.appendGroup(dst, fields, "")
|
||||||
|
|
||||||
|
return append(dst, b.group.end)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b BaseEncoder) AppendArray(dst []byte, in []Value) []byte {
|
||||||
|
dst = append(dst, b.array.start)
|
||||||
|
if len(in) > 0 {
|
||||||
|
dst = b.appendValue(dst, in[0], "", 0)
|
||||||
|
for _, value := range in[1:] {
|
||||||
|
dst = b.appendValue(append(dst, b.array.deli), value, "", 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return append(dst, b.array.end)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b BaseEncoder) AppendBytes(dst, in []byte) []byte {
|
||||||
|
dst = append(dst, '"')
|
||||||
|
dst = append(dst, in...)
|
||||||
|
|
||||||
|
return append(dst, '"')
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b BaseEncoder) appendGroup(dst []byte, fields []Field, prefix string) []byte {
|
||||||
|
if len(fields) > 0 {
|
||||||
|
dst = b.appendField(dst, fields[0], ".", b.delimeter)
|
||||||
|
for _, field := range fields[1:] {
|
||||||
|
dst = b.appendField(append(dst, b.group.deli), field, prefix, b.delimeter)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return dst
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b BaseEncoder) appendField(dst []byte, field Field, prefix string, deli byte) []byte {
|
||||||
|
dst = b.AppendKey(dst, field.Key, prefix)
|
||||||
|
|
||||||
|
return b.appendValue(dst, field.Value, field.Key+".", deli)
|
||||||
|
}
|
||||||
|
|
||||||
|
//nolint:mnd,gocyclo,cyclop
|
||||||
func (b BaseEncoder) appendValue(dst []byte, val Value, prefix string, deli byte) []byte {
|
func (b BaseEncoder) appendValue(dst []byte, val Value, prefix string, deli byte) []byte {
|
||||||
switch val.Kind {
|
switch val.Kind {
|
||||||
case KindGroup:
|
case KindGroup:
|
||||||
@@ -143,139 +282,3 @@ func (b BaseEncoder) appendValue(dst []byte, val Value, prefix string, deli byte
|
|||||||
|
|
||||||
return b.DefaultValue(b.AppendDelimiter(dst, deli), b, val)
|
return b.DefaultValue(b.AppendDelimiter(dst, deli), b, val)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b BaseEncoder) AppendDuration(dst []byte, d time.Duration) []byte {
|
|
||||||
return b.AppendString(dst, d.String())
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) AppendTime(dst []byte, t time.Time) []byte {
|
|
||||||
return b.AppendString(dst, t.Format(b.timeFormat))
|
|
||||||
}
|
|
||||||
|
|
||||||
func AppendString(dst []byte, in string) []byte {
|
|
||||||
if needsQuoting(in) {
|
|
||||||
return strconv.AppendQuote(dst, in)
|
|
||||||
}
|
|
||||||
|
|
||||||
return append(dst, in...)
|
|
||||||
}
|
|
||||||
|
|
||||||
//nolint:cyclop
|
|
||||||
func needsQuoting(in string) bool {
|
|
||||||
if len(in) == 0 {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := 0; i < len(in); {
|
|
||||||
char := in[i]
|
|
||||||
if char < utf8.RuneSelf {
|
|
||||||
// Quote anything except a backslash that would need quoting in a
|
|
||||||
// JSON string, as well as space and '='
|
|
||||||
if char != '\\' && (char == ' ' || char == '=' || !safeSet[char]) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
i++
|
|
||||||
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
decodeRune, size := utf8.DecodeRuneInString(in[i:])
|
|
||||||
if decodeRune == utf8.RuneError || unicode.IsSpace(decodeRune) || !unicode.IsPrint(decodeRune) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
i += size
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) AppendField(dst []byte, field Field) []byte {
|
|
||||||
prefix := ""
|
|
||||||
|
|
||||||
if len(dst) != 0 {
|
|
||||||
prew := dst[len(dst)-1]
|
|
||||||
if prew != '{' && prew != '.' {
|
|
||||||
prefix = string(b.group.deli)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return b.appendField(dst, field, prefix, b.delimeter)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) appendField(dst []byte, field Field, prefix string, deli byte) []byte {
|
|
||||||
dst = b.AppendKey(dst, field.Key, prefix)
|
|
||||||
|
|
||||||
return b.appendValue(dst, field.Value, field.Key+".", deli)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) AppendKey(dst []byte, key string, prefix string) []byte {
|
|
||||||
if prefix != "" {
|
|
||||||
dst = append(dst, prefix...)
|
|
||||||
}
|
|
||||||
|
|
||||||
return b.AppendString(dst, key)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) AppendComplex(dst []byte, c complex128) []byte {
|
|
||||||
cmplx := strconv.FormatComplex(c, 'g', -1, 128)
|
|
||||||
|
|
||||||
return b.AppendString(dst, cmplx)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) AppendFloat(dst []byte, f float64, bitSize int) []byte {
|
|
||||||
return strconv.AppendFloat(dst, f, 'g', -1, bitSize)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) AppendUint(dst []byte, u uint64) []byte {
|
|
||||||
return strconv.AppendUint(dst, u, 10)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) AppendNull(dst []byte) []byte {
|
|
||||||
return append(dst, b.nullValue...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) AppendInt(dst []byte, val int64) []byte {
|
|
||||||
return strconv.AppendInt(dst, val, 10)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) AppendBool(dst []byte, val bool) []byte {
|
|
||||||
return strconv.AppendBool(dst, val)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) AppendGroup(dst []byte, fields []Field) []byte {
|
|
||||||
dst = append(dst, b.group.start)
|
|
||||||
dst = b.appendGroup(dst, fields, "")
|
|
||||||
|
|
||||||
return append(dst, b.group.end)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) appendGroup(dst []byte, fields []Field, prefix string) []byte {
|
|
||||||
if len(fields) > 0 {
|
|
||||||
dst = b.appendField(dst, fields[0], ".", b.delimeter)
|
|
||||||
for _, field := range fields[1:] {
|
|
||||||
dst = b.appendField(append(dst, b.group.deli), field, prefix, b.delimeter)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return dst
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) AppendArray(dst []byte, in []Value) []byte {
|
|
||||||
dst = append(dst, b.array.start)
|
|
||||||
if len(in) > 0 {
|
|
||||||
dst = b.appendValue(dst, in[0], "", 0)
|
|
||||||
for _, value := range in[1:] {
|
|
||||||
dst = b.appendValue(append(dst, b.array.deli), value, "", 0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return append(dst, b.array.end)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b BaseEncoder) AppendBytes(dst, in []byte) []byte {
|
|
||||||
dst = append(dst, '"')
|
|
||||||
dst = append(dst, in...)
|
|
||||||
|
|
||||||
return append(dst, '"')
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ func TestEncoderJSONAppendField_string(t *testing.T) {
|
|||||||
encode := field.NewEncoderJSON()
|
encode := field.NewEncoderJSON()
|
||||||
|
|
||||||
buf := buffer.New()
|
buf := buffer.New()
|
||||||
|
|
||||||
defer func() {
|
defer func() {
|
||||||
buf.Free()
|
buf.Free()
|
||||||
}()
|
}()
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package field
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"slices"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -501,3 +502,7 @@ type Field struct {
|
|||||||
func (f Field) String() string {
|
func (f Field) String() string {
|
||||||
return fmt.Sprintf("%s=%+v", f.Key, f.Value)
|
return fmt.Sprintf("%s=%+v", f.Key, f.Value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (f Field) IsKey(keys ...string) bool {
|
||||||
|
return slices.Contains(keys, f.Key)
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// nolint: exhaustruct
|
//nolint:exhaustruct
|
||||||
package field
|
package field
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -27,7 +27,7 @@ func StringpValue(value *string) Value {
|
|||||||
return StringValue(*value)
|
return StringValue(*value)
|
||||||
}
|
}
|
||||||
|
|
||||||
// StringpValue returns a new Value for a string.
|
// StringsValue returns a new Value for a string.
|
||||||
func StringsValue(value []string) Value {
|
func StringsValue(value []string) Value {
|
||||||
return Value{
|
return Value{
|
||||||
Kind: KindArray,
|
Kind: KindArray,
|
||||||
@@ -115,7 +115,7 @@ func Uint8sValue(values []uint8) Value {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Uint64sValue returns a Value for a []uint64.
|
// Uint64pValue returns a Value for a []uint64.
|
||||||
func Uint64pValue(v *uint64) Value {
|
func Uint64pValue(v *uint64) Value {
|
||||||
if v == nil {
|
if v == nil {
|
||||||
return NilValue()
|
return NilValue()
|
||||||
@@ -145,7 +145,7 @@ func Int64sValue(value []int64) Value {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Int64sValue returns a Value for an *int64.
|
// Int64pValue returns a Value for an *int64.
|
||||||
func Int64pValue(value *int64) Value {
|
func Int64pValue(value *int64) Value {
|
||||||
if value == nil {
|
if value == nil {
|
||||||
return NilValue()
|
return NilValue()
|
||||||
@@ -159,7 +159,7 @@ func Float64Value(v float64) Value {
|
|||||||
return Value{num: math.Float64bits(v), Kind: KindFloat64}
|
return Value{num: math.Float64bits(v), Kind: KindFloat64}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Float64Value returns a Value for a floating-points number.
|
// Float64sValue returns a Value for a floating-points number.
|
||||||
func Float64sValue(values []float64) Value {
|
func Float64sValue(values []float64) Value {
|
||||||
return Value{
|
return Value{
|
||||||
Kind: KindArray,
|
Kind: KindArray,
|
||||||
@@ -175,7 +175,7 @@ func Float64sValue(values []float64) Value {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Float64Value returns a Value for a floating-points number.
|
// Float64pValue returns a Value for a floating-points number.
|
||||||
func Float64pValue(v *float64) Value {
|
func Float64pValue(v *float64) Value {
|
||||||
if v == nil {
|
if v == nil {
|
||||||
return NilValue()
|
return NilValue()
|
||||||
@@ -208,7 +208,7 @@ func Complex128Value(v complex128) Value {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Complex128Value returns a Value for a []complex128.
|
// Complex128sValue returns a Value for a []complex128.
|
||||||
func Complex128sValue(values []complex128) Value {
|
func Complex128sValue(values []complex128) Value {
|
||||||
return Value{
|
return Value{
|
||||||
Kind: KindArray,
|
Kind: KindArray,
|
||||||
@@ -224,7 +224,7 @@ func Complex128sValue(values []complex128) Value {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Complex128Value returns a Value for a *complex128.
|
// Complex128pValue returns a Value for a *complex128.
|
||||||
func Complex128pValue(v *complex128) Value {
|
func Complex128pValue(v *complex128) Value {
|
||||||
if v == nil {
|
if v == nil {
|
||||||
return NilValue()
|
return NilValue()
|
||||||
@@ -275,7 +275,7 @@ func DurationValue(v time.Duration) Value {
|
|||||||
return Value{inum: v.Nanoseconds(), Kind: KindDuration}
|
return Value{inum: v.Nanoseconds(), Kind: KindDuration}
|
||||||
}
|
}
|
||||||
|
|
||||||
// DurationValue returns a Value for a *time.Duration.
|
// DurationpValue returns a Value for a *time.Duration.
|
||||||
func DurationpValue(v *time.Duration) Value {
|
func DurationpValue(v *time.Duration) Value {
|
||||||
if v == nil {
|
if v == nil {
|
||||||
return NilValue()
|
return NilValue()
|
||||||
@@ -284,7 +284,7 @@ func DurationpValue(v *time.Duration) Value {
|
|||||||
return DurationValue(*v)
|
return DurationValue(*v)
|
||||||
}
|
}
|
||||||
|
|
||||||
// DurationValue returns a Value for a *time.Duration.
|
// DurationsValue returns a Value for a *time.Duration.
|
||||||
func DurationsValue(values []time.Duration) Value {
|
func DurationsValue(values []time.Duration) Value {
|
||||||
return Value{
|
return Value{
|
||||||
Kind: KindArray,
|
Kind: KindArray,
|
||||||
@@ -469,42 +469,7 @@ func (v Value) String() string {
|
|||||||
return string(v.append(buf))
|
return string(v.append(buf))
|
||||||
}
|
}
|
||||||
|
|
||||||
// append appends a text representation of v to dst.
|
//nolint:gocyclo,cyclop
|
||||||
// v is formatted as with fmt.Sprint.
|
|
||||||
//
|
|
||||||
//nolint:gomnd,cyclop
|
|
||||||
func (v Value) append(dst []byte) []byte {
|
|
||||||
switch v.Kind {
|
|
||||||
case KindString:
|
|
||||||
return append(dst, v.AsString()...)
|
|
||||||
case KindInt64:
|
|
||||||
return strconv.AppendInt(dst, v.inum, 10)
|
|
||||||
case KindUint64:
|
|
||||||
return strconv.AppendUint(dst, v.num, 10)
|
|
||||||
case KindFloat64:
|
|
||||||
return strconv.AppendFloat(dst, v.AsFloat64(), 'g', -1, 64)
|
|
||||||
case KindFloat32:
|
|
||||||
return strconv.AppendFloat(dst, float64(v.AsFloat32()), 'g', -1, 32)
|
|
||||||
case KindBool:
|
|
||||||
return strconv.AppendBool(dst, v.AsBool())
|
|
||||||
case KindDuration:
|
|
||||||
return append(dst, v.AsDuration().String()...)
|
|
||||||
case KindTime:
|
|
||||||
return append(dst, v.AsTime().String()...)
|
|
||||||
case KindError:
|
|
||||||
return append(dst, v.AsError().Error()...)
|
|
||||||
case KindGroup:
|
|
||||||
return fmt.Append(dst, v.AsGroup())
|
|
||||||
case KindClosure:
|
|
||||||
return fmt.Append(dst, v.Resolve())
|
|
||||||
case KindAny:
|
|
||||||
return fmt.Append(dst, v.any)
|
|
||||||
default:
|
|
||||||
return fmt.Appendf(dst, "%+v", v.any)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// nolint: gocyclo,cyclop
|
|
||||||
func (v Value) Any() any {
|
func (v Value) Any() any {
|
||||||
switch v.Kind {
|
switch v.Kind {
|
||||||
case KindAny, KindBinary:
|
case KindAny, KindBinary:
|
||||||
@@ -542,7 +507,7 @@ func (v Value) Any() any {
|
|||||||
return v.any
|
return v.any
|
||||||
}
|
}
|
||||||
|
|
||||||
// nolint: forcetypeassert
|
//nolint:forcetypeassert
|
||||||
func (v Value) AsString() string {
|
func (v Value) AsString() string {
|
||||||
if v.Kind != KindString {
|
if v.Kind != KindString {
|
||||||
return ""
|
return ""
|
||||||
@@ -567,6 +532,7 @@ func (v Value) AsUint64() uint64 {
|
|||||||
return v.num
|
return v.num
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//nolint:gosec
|
||||||
func (v Value) AsFloat32() float32 {
|
func (v Value) AsFloat32() float32 {
|
||||||
return math.Float32frombits(uint32(v.num))
|
return math.Float32frombits(uint32(v.num))
|
||||||
}
|
}
|
||||||
@@ -649,3 +615,38 @@ func (v Value) AsArray() Values {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// append appends a text representation of v to dst.
|
||||||
|
// v is formatted as with fmt.Sprint.
|
||||||
|
//
|
||||||
|
//nolint:mnd,cyclop
|
||||||
|
func (v Value) append(dst []byte) []byte {
|
||||||
|
switch v.Kind {
|
||||||
|
case KindString:
|
||||||
|
return append(dst, v.AsString()...)
|
||||||
|
case KindInt64:
|
||||||
|
return strconv.AppendInt(dst, v.inum, 10)
|
||||||
|
case KindUint64:
|
||||||
|
return strconv.AppendUint(dst, v.num, 10)
|
||||||
|
case KindFloat64:
|
||||||
|
return strconv.AppendFloat(dst, v.AsFloat64(), 'g', -1, 64)
|
||||||
|
case KindFloat32:
|
||||||
|
return strconv.AppendFloat(dst, float64(v.AsFloat32()), 'g', -1, 32)
|
||||||
|
case KindBool:
|
||||||
|
return strconv.AppendBool(dst, v.AsBool())
|
||||||
|
case KindDuration:
|
||||||
|
return append(dst, v.AsDuration().String()...)
|
||||||
|
case KindTime:
|
||||||
|
return append(dst, v.AsTime().String()...)
|
||||||
|
case KindError:
|
||||||
|
return append(dst, v.AsError().Error()...)
|
||||||
|
case KindGroup:
|
||||||
|
return fmt.Append(dst, v.AsGroup())
|
||||||
|
case KindClosure:
|
||||||
|
return fmt.Append(dst, v.Resolve())
|
||||||
|
case KindAny:
|
||||||
|
return fmt.Append(dst, v.any)
|
||||||
|
default:
|
||||||
|
return fmt.Appendf(dst, "%+v", v.any)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
71
global.go
71
global.go
@@ -3,14 +3,15 @@ package log
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"io"
|
"io"
|
||||||
|
"time"
|
||||||
|
|
||||||
"gitoa.ru/go-4devs/log/field"
|
"gitoa.ru/go-4devs/log/field"
|
||||||
"gitoa.ru/go-4devs/log/level"
|
"gitoa.ru/go-4devs/log/level"
|
||||||
)
|
)
|
||||||
|
|
||||||
//nolint:gochecknoglobals,gomnd
|
//nolint:gochecknoglobals
|
||||||
var global = With(New(),
|
var global = With(New(),
|
||||||
WithSource(2, TrimPath),
|
WithTime(KeyTime, time.RFC3339),
|
||||||
WithLevel(KeyLevel, level.Debug),
|
WithLevel(KeyLevel, level.Debug),
|
||||||
WithExit(level.Alert),
|
WithExit(level.Alert),
|
||||||
WithPanic(level.Emergency),
|
WithPanic(level.Emergency),
|
||||||
@@ -27,112 +28,112 @@ func Log() Logger {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Emerg log by emergency level.
|
// Emerg log by emergency level.
|
||||||
func Emerg(ctx context.Context, args ...interface{}) {
|
func Emerg(ctx context.Context, args ...any) {
|
||||||
global.Emerg(ctx, args...)
|
global.Emerg(ctx, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alert log by alert level.
|
// Alert log by alert level.
|
||||||
func Alert(ctx context.Context, args ...interface{}) {
|
func Alert(ctx context.Context, args ...any) {
|
||||||
global.Alert(ctx, args...)
|
global.Alert(ctx, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Crit log by critical level.
|
// Crit log by critical level.
|
||||||
func Crit(ctx context.Context, args ...interface{}) {
|
func Crit(ctx context.Context, args ...any) {
|
||||||
global.Crit(ctx, args...)
|
global.Crit(ctx, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Err log by error level.
|
// Err log by error level.
|
||||||
func Err(ctx context.Context, args ...interface{}) {
|
func Err(ctx context.Context, args ...any) {
|
||||||
global.Err(ctx, args...)
|
global.Err(ctx, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Warn logs by warning level.
|
// Warn logs by warning level.
|
||||||
func Warn(ctx context.Context, args ...interface{}) {
|
func Warn(ctx context.Context, args ...any) {
|
||||||
global.Warn(ctx, args...)
|
global.Warn(ctx, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Notice log by notice level.
|
// Notice log by notice level.
|
||||||
func Notice(ctx context.Context, args ...interface{}) {
|
func Notice(ctx context.Context, args ...any) {
|
||||||
global.Notice(ctx, args...)
|
global.Notice(ctx, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Info log by info level.
|
// Info log by info level.
|
||||||
func Info(ctx context.Context, args ...interface{}) {
|
func Info(ctx context.Context, args ...any) {
|
||||||
global.Info(ctx, args...)
|
global.Info(ctx, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Debug log by debug level.
|
// Debug log by debug level.
|
||||||
func Debug(ctx context.Context, args ...interface{}) {
|
func Debug(ctx context.Context, args ...any) {
|
||||||
global.Debug(ctx, args...)
|
global.Debug(ctx, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Print log by info level and arguments.
|
// Print log by info level and arguments.
|
||||||
func Print(args ...interface{}) {
|
func Print(args ...any) {
|
||||||
global.Print(args...)
|
global.Print(args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fatal log by alert level and arguments.
|
// Fatal log by alert level and arguments.
|
||||||
func Fatal(args ...interface{}) {
|
func Fatal(args ...any) {
|
||||||
global.Fatal(args...)
|
global.Fatal(args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Panic log by emergency level and arguments.
|
// Panic log by emergency level and arguments.
|
||||||
func Panic(args ...interface{}) {
|
func Panic(args ...any) {
|
||||||
global.Panic(args...)
|
global.Panic(args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Println log by info level and arguments.
|
// Println log by info level and arguments.
|
||||||
func Println(args ...interface{}) {
|
func Println(args ...any) {
|
||||||
global.Println(args...)
|
global.Println(args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fatalln log by alert level and arguments.
|
// Fatalln log by alert level and arguments.
|
||||||
func Fatalln(args ...interface{}) {
|
func Fatalln(args ...any) {
|
||||||
global.Fatalln(args...)
|
global.Fatalln(args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Panicln log by emergency level and arguments.
|
// Panicln log by emergency level and arguments.
|
||||||
func Panicln(args ...interface{}) {
|
func Panicln(args ...any) {
|
||||||
global.Panicln(args...)
|
global.Panicln(args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// EmergKVs sugared log by emergency level and key-values.
|
// EmergKVs sugared log by emergency level and key-values.
|
||||||
func EmergKVs(ctx context.Context, msg string, args ...interface{}) {
|
func EmergKVs(ctx context.Context, msg string, args ...any) {
|
||||||
global.EmergKVs(ctx, msg, args...)
|
global.EmergKVs(ctx, msg, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// AlertKVs sugared log by alert level and key-values.
|
// AlertKVs sugared log by alert level and key-values.
|
||||||
func AlertKVs(ctx context.Context, msg string, args ...interface{}) {
|
func AlertKVs(ctx context.Context, msg string, args ...any) {
|
||||||
global.AlertKVs(ctx, msg, args...)
|
global.AlertKVs(ctx, msg, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// CritKVs sugared log by critcal level and key-values.
|
// CritKVs sugared log by critcal level and key-values.
|
||||||
func CritKVs(ctx context.Context, msg string, args ...interface{}) {
|
func CritKVs(ctx context.Context, msg string, args ...any) {
|
||||||
global.CritKVs(ctx, msg, args...)
|
global.CritKVs(ctx, msg, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ErrKVs sugared log by error level and key-values.
|
// ErrKVs sugared log by error level and key-values.
|
||||||
func ErrKVs(ctx context.Context, msg string, args ...interface{}) {
|
func ErrKVs(ctx context.Context, msg string, args ...any) {
|
||||||
global.ErrKVs(ctx, msg, args...)
|
global.ErrKVs(ctx, msg, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// WarnKVs sugared log by warning level and key-values.
|
// WarnKVs sugared log by warning level and key-values.
|
||||||
func WarnKVs(ctx context.Context, msg string, args ...interface{}) {
|
func WarnKVs(ctx context.Context, msg string, args ...any) {
|
||||||
global.WarnKVs(ctx, msg, args...)
|
global.WarnKVs(ctx, msg, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// NoticeKVs sugared log by notice level and key-values.
|
// NoticeKVs sugared log by notice level and key-values.
|
||||||
func NoticeKVs(ctx context.Context, msg string, args ...interface{}) {
|
func NoticeKVs(ctx context.Context, msg string, args ...any) {
|
||||||
global.NoticeKVs(ctx, msg, args...)
|
global.NoticeKVs(ctx, msg, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// InfoKVs sugared log by info level and key-values.
|
// InfoKVs sugared log by info level and key-values.
|
||||||
func InfoKVs(ctx context.Context, msg string, args ...interface{}) {
|
func InfoKVs(ctx context.Context, msg string, args ...any) {
|
||||||
global.InfoKVs(ctx, msg, args...)
|
global.InfoKVs(ctx, msg, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// DebugKVs sugared log by debug level and key-values.
|
// DebugKVs sugared log by debug level and key-values.
|
||||||
func DebugKVs(ctx context.Context, msg string, args ...interface{}) {
|
func DebugKVs(ctx context.Context, msg string, args ...any) {
|
||||||
global.DebugKVs(ctx, msg, args...)
|
global.DebugKVs(ctx, msg, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -177,57 +178,57 @@ func DebugKV(ctx context.Context, msg string, args ...field.Field) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Emergf log by emergency level by format and arguments.
|
// Emergf log by emergency level by format and arguments.
|
||||||
func Emergf(ctx context.Context, format string, args ...interface{}) {
|
func Emergf(ctx context.Context, format string, args ...any) {
|
||||||
global.Emergf(ctx, format, args...)
|
global.Emergf(ctx, format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alertf log by alert level by format and arguments.
|
// Alertf log by alert level by format and arguments.
|
||||||
func Alertf(ctx context.Context, format string, args ...interface{}) {
|
func Alertf(ctx context.Context, format string, args ...any) {
|
||||||
global.Alertf(ctx, format, args...)
|
global.Alertf(ctx, format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Critf log by critical level by format and arguments.
|
// Critf log by critical level by format and arguments.
|
||||||
func Critf(ctx context.Context, format string, args ...interface{}) {
|
func Critf(ctx context.Context, format string, args ...any) {
|
||||||
global.Critf(ctx, format, args...)
|
global.Critf(ctx, format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Errf log by error level by format and arguments.
|
// Errf log by error level by format and arguments.
|
||||||
func Errf(ctx context.Context, format string, args ...interface{}) {
|
func Errf(ctx context.Context, format string, args ...any) {
|
||||||
global.Errf(ctx, format, args...)
|
global.Errf(ctx, format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Warnf log by warning level by format and arguments.
|
// Warnf log by warning level by format and arguments.
|
||||||
func Warnf(ctx context.Context, format string, args ...interface{}) {
|
func Warnf(ctx context.Context, format string, args ...any) {
|
||||||
global.Warnf(ctx, format, args...)
|
global.Warnf(ctx, format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Noticef log by notice level by format and arguments.
|
// Noticef log by notice level by format and arguments.
|
||||||
func Noticef(ctx context.Context, format string, args ...interface{}) {
|
func Noticef(ctx context.Context, format string, args ...any) {
|
||||||
global.Noticef(ctx, format, args...)
|
global.Noticef(ctx, format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Infof log by info level by format and arguments.
|
// Infof log by info level by format and arguments.
|
||||||
func Infof(ctx context.Context, format string, args ...interface{}) {
|
func Infof(ctx context.Context, format string, args ...any) {
|
||||||
global.Noticef(ctx, format, args...)
|
global.Noticef(ctx, format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Debugf log by debug level by format and arguments.
|
// Debugf log by debug level by format and arguments.
|
||||||
func Debugf(ctx context.Context, format string, args ...interface{}) {
|
func Debugf(ctx context.Context, format string, args ...any) {
|
||||||
global.Debugf(ctx, format, args...)
|
global.Debugf(ctx, format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Printf log by info level by format and arguments without context.
|
// Printf log by info level by format and arguments without context.
|
||||||
func Printf(format string, args ...interface{}) {
|
func Printf(format string, args ...any) {
|
||||||
global.Printf(format, args...)
|
global.Printf(format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fatalf log by alert level by format and arguments without context.
|
// Fatalf log by alert level by format and arguments without context.
|
||||||
func Fatalf(format string, args ...interface{}) {
|
func Fatalf(format string, args ...any) {
|
||||||
global.Fatalf(format, args...)
|
global.Fatalf(format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Panicf log by emergency level and arguments without context.
|
// Panicf log by emergency level and arguments without context.
|
||||||
func Panicf(format string, args ...interface{}) {
|
func Panicf(format string, args ...any) {
|
||||||
global.Panicf(format, args...)
|
global.Panicf(format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
2
go.mod
2
go.mod
@@ -1,3 +1,3 @@
|
|||||||
module gitoa.ru/go-4devs/log
|
module gitoa.ru/go-4devs/log
|
||||||
|
|
||||||
go 1.20
|
go 1.22
|
||||||
|
|||||||
@@ -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())
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -51,7 +51,9 @@ func TestUnmarshalJSON(t *testing.T) {
|
|||||||
for expect, actuals := range levels {
|
for expect, actuals := range levels {
|
||||||
for _, actual := range actuals {
|
for _, actual := range actuals {
|
||||||
var level level.Level
|
var level level.Level
|
||||||
if err := level.UnmarshalJSON([]byte(actual)); err != nil {
|
|
||||||
|
err := level.UnmarshalJSON([]byte(actual))
|
||||||
|
if err != nil {
|
||||||
t.Errorf("%s got err: %s", level, err)
|
t.Errorf("%s got err: %s", level, err)
|
||||||
|
|
||||||
continue
|
continue
|
||||||
|
|||||||
177
logger.go
177
logger.go
@@ -28,172 +28,118 @@ func (l Logger) Write(in []byte) (int, error) {
|
|||||||
return l.write(context.Background(), level.Info, string(in))
|
return l.write(context.Background(), level.Info, string(in))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l Logger) write(ctx context.Context, level level.Level, msg string, fields ...field.Field) (int, error) {
|
|
||||||
data := entry.Get()
|
|
||||||
|
|
||||||
defer func() {
|
|
||||||
entry.Put(data)
|
|
||||||
}()
|
|
||||||
|
|
||||||
return l(ctx, data.SetLevel(level).SetMessage(msg).Add(fields...))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l Logger) writef(ctx context.Context, level level.Level, format string, args ...interface{}) (int, error) {
|
|
||||||
data := entry.Get()
|
|
||||||
|
|
||||||
defer func() {
|
|
||||||
entry.Put(data)
|
|
||||||
}()
|
|
||||||
|
|
||||||
return l(ctx, data.SetLevel(level).SetMessagef(format, args...))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l Logger) kv(_ context.Context, args ...interface{}) field.Fields {
|
|
||||||
kvEntry := entry.Get()
|
|
||||||
|
|
||||||
defer func() {
|
|
||||||
entry.Put(kvEntry)
|
|
||||||
}()
|
|
||||||
|
|
||||||
for i := 0; i < len(args); i++ {
|
|
||||||
if f, ok := args[i].(field.Field); ok {
|
|
||||||
kvEntry = kvEntry.Add(f)
|
|
||||||
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if i == len(args)-1 {
|
|
||||||
kvEntry = kvEntry.AddAny(badKey, args[i])
|
|
||||||
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
key, val := args[i], args[i+1]
|
|
||||||
if keyStr, ok := key.(string); ok {
|
|
||||||
kvEntry = kvEntry.AddAny(keyStr, val)
|
|
||||||
i++
|
|
||||||
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
kvEntry = kvEntry.AddAny(badKey, args[i])
|
|
||||||
}
|
|
||||||
|
|
||||||
return kvEntry.Fields()
|
|
||||||
}
|
|
||||||
|
|
||||||
// With adds middlewares to logger.
|
// With adds middlewares to logger.
|
||||||
func (l Logger) With(mw ...Middleware) Logger {
|
func (l Logger) With(mw ...Middleware) Logger {
|
||||||
return With(l, mw...)
|
return With(l, mw...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Emerg log by emergency level.
|
// Emerg log by emergency level.
|
||||||
func (l Logger) Emerg(ctx context.Context, args ...interface{}) {
|
func (l Logger) Emerg(ctx context.Context, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Emergency, "", args...))
|
writeOutput(l.writef(ctx, level.Emergency, "", args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alert log by alert level.
|
// Alert log by alert level.
|
||||||
func (l Logger) Alert(ctx context.Context, args ...interface{}) {
|
func (l Logger) Alert(ctx context.Context, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Alert, "", args...))
|
writeOutput(l.writef(ctx, level.Alert, "", args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Crit log by critical level.
|
// Crit log by critical level.
|
||||||
func (l Logger) Crit(ctx context.Context, args ...interface{}) {
|
func (l Logger) Crit(ctx context.Context, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Critical, "", args...))
|
writeOutput(l.writef(ctx, level.Critical, "", args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Err log by error level.
|
// Err log by error level.
|
||||||
func (l Logger) Err(ctx context.Context, args ...interface{}) {
|
func (l Logger) Err(ctx context.Context, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Error, "", args...))
|
writeOutput(l.writef(ctx, level.Error, "", args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Warn log by warning level.
|
// Warn log by warning level.
|
||||||
func (l Logger) Warn(ctx context.Context, args ...interface{}) {
|
func (l Logger) Warn(ctx context.Context, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Warning, "", args...))
|
writeOutput(l.writef(ctx, level.Warning, "", args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Notice log by notice level.
|
// Notice log by notice level.
|
||||||
func (l Logger) Notice(ctx context.Context, args ...interface{}) {
|
func (l Logger) Notice(ctx context.Context, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Notice, "", args...))
|
writeOutput(l.writef(ctx, level.Notice, "", args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Info log by info level.
|
// Info log by info level.
|
||||||
func (l Logger) Info(ctx context.Context, args ...interface{}) {
|
func (l Logger) Info(ctx context.Context, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Info, "", args...))
|
writeOutput(l.writef(ctx, level.Info, "", args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Debug log by debug level.
|
// Debug log by debug level.
|
||||||
func (l Logger) Debug(ctx context.Context, args ...interface{}) {
|
func (l Logger) Debug(ctx context.Context, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Debug, "", args...))
|
writeOutput(l.writef(ctx, level.Debug, "", args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Print log by info level and arguments.
|
// Print log by info level and arguments.
|
||||||
func (l Logger) Print(args ...interface{}) {
|
func (l Logger) Print(args ...any) {
|
||||||
writeOutput(l.writef(context.Background(), level.Info, "", args...))
|
writeOutput(l.writef(context.Background(), level.Info, "", args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fatal log by alert level and arguments.
|
// Fatal log by alert level and arguments.
|
||||||
func (l Logger) Fatal(args ...interface{}) {
|
func (l Logger) Fatal(args ...any) {
|
||||||
writeOutput(l.writef(context.Background(), level.Alert, "", args...))
|
writeOutput(l.writef(context.Background(), level.Alert, "", args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Panic log by emergency level and arguments.
|
// Panic log by emergency level and arguments.
|
||||||
func (l Logger) Panic(args ...interface{}) {
|
func (l Logger) Panic(args ...any) {
|
||||||
writeOutput(l.writef(context.Background(), level.Emergency, "", args...))
|
writeOutput(l.writef(context.Background(), level.Emergency, "", args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Println log by info level and arguments.
|
// Println log by info level and arguments.
|
||||||
func (l Logger) Println(args ...interface{}) {
|
func (l Logger) Println(args ...any) {
|
||||||
writeOutput(l.write(context.Background(), level.Info, fmt.Sprintln(args...)))
|
writeOutput(l.write(context.Background(), level.Info, fmt.Sprintln(args...)))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fatalln log by alert level and arguments.
|
// Fatalln log by alert level and arguments.
|
||||||
func (l Logger) Fatalln(args ...interface{}) {
|
func (l Logger) Fatalln(args ...any) {
|
||||||
writeOutput(l.write(context.Background(), level.Alert, fmt.Sprintln(args...)))
|
writeOutput(l.write(context.Background(), level.Alert, fmt.Sprintln(args...)))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Panicln log by emergency level and arguments.
|
// Panicln log by emergency level and arguments.
|
||||||
func (l Logger) Panicln(args ...interface{}) {
|
func (l Logger) Panicln(args ...any) {
|
||||||
writeOutput(l.write(context.Background(), level.Emergency, fmt.Sprintln(args...)))
|
writeOutput(l.write(context.Background(), level.Emergency, fmt.Sprintln(args...)))
|
||||||
}
|
}
|
||||||
|
|
||||||
// EmergKVs sugared log by emergency level and key-values.
|
// EmergKVs sugared log by emergency level and key-values.
|
||||||
func (l Logger) EmergKVs(ctx context.Context, msg string, args ...interface{}) {
|
func (l Logger) EmergKVs(ctx context.Context, msg string, args ...any) {
|
||||||
writeOutput(l.write(ctx, level.Emergency, msg, l.kv(ctx, args...)...))
|
writeOutput(l.write(ctx, level.Emergency, msg, l.kv(ctx, args...)...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// AlertKVs sugared log by alert level and key-values.
|
// AlertKVs sugared log by alert level and key-values.
|
||||||
func (l Logger) AlertKVs(ctx context.Context, msg string, args ...interface{}) {
|
func (l Logger) AlertKVs(ctx context.Context, msg string, args ...any) {
|
||||||
writeOutput(l.write(ctx, level.Alert, msg, l.kv(ctx, args...)...))
|
writeOutput(l.write(ctx, level.Alert, msg, l.kv(ctx, args...)...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// CritKVs sugared log by critcal level and key-values.
|
// CritKVs sugared log by critcal level and key-values.
|
||||||
func (l Logger) CritKVs(ctx context.Context, msg string, args ...interface{}) {
|
func (l Logger) CritKVs(ctx context.Context, msg string, args ...any) {
|
||||||
writeOutput(l.write(ctx, level.Critical, msg, l.kv(ctx, args...)...))
|
writeOutput(l.write(ctx, level.Critical, msg, l.kv(ctx, args...)...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// ErrKVs sugared log by error level and key-values.
|
// ErrKVs sugared log by error level and key-values.
|
||||||
func (l Logger) ErrKVs(ctx context.Context, msg string, args ...interface{}) {
|
func (l Logger) ErrKVs(ctx context.Context, msg string, args ...any) {
|
||||||
writeOutput(l.write(ctx, level.Error, msg, l.kv(ctx, args...)...))
|
writeOutput(l.write(ctx, level.Error, msg, l.kv(ctx, args...)...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// WarnKVs sugared log by warning level and key-values.
|
// WarnKVs sugared log by warning level and key-values.
|
||||||
func (l Logger) WarnKVs(ctx context.Context, msg string, args ...interface{}) {
|
func (l Logger) WarnKVs(ctx context.Context, msg string, args ...any) {
|
||||||
writeOutput(l.write(ctx, level.Warning, msg, l.kv(ctx, args...)...))
|
writeOutput(l.write(ctx, level.Warning, msg, l.kv(ctx, args...)...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// NoticeKVs sugared log by notice level and key-values.
|
// NoticeKVs sugared log by notice level and key-values.
|
||||||
func (l Logger) NoticeKVs(ctx context.Context, msg string, args ...interface{}) {
|
func (l Logger) NoticeKVs(ctx context.Context, msg string, args ...any) {
|
||||||
writeOutput(l.write(ctx, level.Notice, msg, l.kv(ctx, args...)...))
|
writeOutput(l.write(ctx, level.Notice, msg, l.kv(ctx, args...)...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// InfoKVs sugared log by info level and key-values.
|
// InfoKVs sugared log by info level and key-values.
|
||||||
func (l Logger) InfoKVs(ctx context.Context, msg string, args ...interface{}) {
|
func (l Logger) InfoKVs(ctx context.Context, msg string, args ...any) {
|
||||||
writeOutput(l.write(ctx, level.Info, msg, l.kv(ctx, args...)...))
|
writeOutput(l.write(ctx, level.Info, msg, l.kv(ctx, args...)...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// DebugKVs sugared log by debug level and key-values.
|
// DebugKVs sugared log by debug level and key-values.
|
||||||
func (l Logger) DebugKVs(ctx context.Context, msg string, args ...interface{}) {
|
func (l Logger) DebugKVs(ctx context.Context, msg string, args ...any) {
|
||||||
writeOutput(l.write(ctx, level.Debug, msg, l.kv(ctx, args...)...))
|
writeOutput(l.write(ctx, level.Debug, msg, l.kv(ctx, args...)...))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -238,57 +184,57 @@ func (l Logger) DebugKV(ctx context.Context, msg string, args ...field.Field) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Emergf log by emergency level by format and arguments.
|
// Emergf log by emergency level by format and arguments.
|
||||||
func (l Logger) Emergf(ctx context.Context, format string, args ...interface{}) {
|
func (l Logger) Emergf(ctx context.Context, format string, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Emergency, format, args...))
|
writeOutput(l.writef(ctx, level.Emergency, format, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alertf log by alert level by format and arguments.
|
// Alertf log by alert level by format and arguments.
|
||||||
func (l Logger) Alertf(ctx context.Context, format string, args ...interface{}) {
|
func (l Logger) Alertf(ctx context.Context, format string, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Alert, format, args...))
|
writeOutput(l.writef(ctx, level.Alert, format, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Critf log by critical level by format and arguments.
|
// Critf log by critical level by format and arguments.
|
||||||
func (l Logger) Critf(ctx context.Context, format string, args ...interface{}) {
|
func (l Logger) Critf(ctx context.Context, format string, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Critical, format, args...))
|
writeOutput(l.writef(ctx, level.Critical, format, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Errf log by error level by format and arguments.
|
// Errf log by error level by format and arguments.
|
||||||
func (l Logger) Errf(ctx context.Context, format string, args ...interface{}) {
|
func (l Logger) Errf(ctx context.Context, format string, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Error, format, args...))
|
writeOutput(l.writef(ctx, level.Error, format, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Warnf log by warning level by format and arguments.
|
// Warnf log by warning level by format and arguments.
|
||||||
func (l Logger) Warnf(ctx context.Context, format string, args ...interface{}) {
|
func (l Logger) Warnf(ctx context.Context, format string, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Warning, format, args...))
|
writeOutput(l.writef(ctx, level.Warning, format, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Noticef log by notice level by format and arguments.
|
// Noticef log by notice level by format and arguments.
|
||||||
func (l Logger) Noticef(ctx context.Context, format string, args ...interface{}) {
|
func (l Logger) Noticef(ctx context.Context, format string, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Notice, format, args...))
|
writeOutput(l.writef(ctx, level.Notice, format, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Infof log by info level by format and arguments.
|
// Infof log by info level by format and arguments.
|
||||||
func (l Logger) Infof(ctx context.Context, format string, args ...interface{}) {
|
func (l Logger) Infof(ctx context.Context, format string, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Info, format, args...))
|
writeOutput(l.writef(ctx, level.Info, format, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Debugf log by debug level by format and arguments.
|
// Debugf log by debug level by format and arguments.
|
||||||
func (l Logger) Debugf(ctx context.Context, format string, args ...interface{}) {
|
func (l Logger) Debugf(ctx context.Context, format string, args ...any) {
|
||||||
writeOutput(l.writef(ctx, level.Debug, format, args...))
|
writeOutput(l.writef(ctx, level.Debug, format, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Printf log by info level by format and arguments without context.
|
// Printf log by info level by format and arguments without context.
|
||||||
func (l Logger) Printf(format string, args ...interface{}) {
|
func (l Logger) Printf(format string, args ...any) {
|
||||||
writeOutput(l.writef(context.Background(), level.Info, format, args...))
|
writeOutput(l.writef(context.Background(), level.Info, format, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fatalf log by alert level by format and arguments without context.
|
// Fatalf log by alert level by format and arguments without context.
|
||||||
func (l Logger) Fatalf(format string, args ...interface{}) {
|
func (l Logger) Fatalf(format string, args ...any) {
|
||||||
writeOutput(l.writef(context.Background(), level.Alert, format, args...))
|
writeOutput(l.writef(context.Background(), level.Alert, format, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Panicf log by emergency level and arguments without context.
|
// Panicf log by emergency level and arguments without context.
|
||||||
func (l Logger) Panicf(format string, args ...interface{}) {
|
func (l Logger) Panicf(format string, args ...any) {
|
||||||
writeOutput(l.writef(context.Background(), level.Emergency, format, args...))
|
writeOutput(l.writef(context.Background(), level.Emergency, format, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -301,12 +247,67 @@ func (l Logger) Writer(ctx context.Context, level level.Level, fields ...field.F
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (l Logger) kv(_ context.Context, args ...any) field.Fields {
|
||||||
|
kvEntry := entry.Get()
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
entry.Put(kvEntry)
|
||||||
|
}()
|
||||||
|
|
||||||
|
for i := 0; i < len(args); i++ {
|
||||||
|
if f, ok := args[i].(field.Field); ok {
|
||||||
|
kvEntry = kvEntry.Add(f)
|
||||||
|
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if i == len(args)-1 {
|
||||||
|
kvEntry = kvEntry.AddAny(badKey, args[i])
|
||||||
|
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
key, val := args[i], args[i+1]
|
||||||
|
if keyStr, ok := key.(string); ok {
|
||||||
|
kvEntry = kvEntry.AddAny(keyStr, val)
|
||||||
|
i++
|
||||||
|
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
kvEntry = kvEntry.AddAny(badKey, args[i])
|
||||||
|
}
|
||||||
|
|
||||||
|
return kvEntry.Fields()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l Logger) write(ctx context.Context, level level.Level, msg string, fields ...field.Field) (int, error) {
|
||||||
|
data := entry.Get()
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
entry.Put(data)
|
||||||
|
}()
|
||||||
|
|
||||||
|
return l(ctx, data.SetLevel(level).SetMessage(msg).Add(fields...))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l Logger) writef(ctx context.Context, level level.Level, format string, args ...any) (int, error) {
|
||||||
|
data := entry.Get()
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
entry.Put(data)
|
||||||
|
}()
|
||||||
|
|
||||||
|
return l(ctx, data.SetLevel(level).SetMessagef(format, args...))
|
||||||
|
}
|
||||||
|
|
||||||
//nolint:containedctx
|
//nolint:containedctx
|
||||||
type writer struct {
|
type writer struct {
|
||||||
|
Logger
|
||||||
|
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
level level.Level
|
level level.Level
|
||||||
fields []field.Field
|
fields []field.Field
|
||||||
Logger
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w writer) WithLevel(level level.Level) writer {
|
func (w writer) WithLevel(level level.Level) writer {
|
||||||
|
|||||||
@@ -213,8 +213,8 @@ func ExampleNew_jsonFormat() {
|
|||||||
logger.Err(ctx, "same error message")
|
logger.Err(ctx, "same error message")
|
||||||
logger.WarnKVs(ctx, "same warn message", "obj", Obj{Name: "obj name"})
|
logger.WarnKVs(ctx, "same warn message", "obj", Obj{Name: "obj name"})
|
||||||
// Output:
|
// Output:
|
||||||
// {"msg":"same error message","level":"error","go-version":"go1.21.5"}
|
// {"msg":"same error message","level":"error","go-version":"go1.25.5"}
|
||||||
// {"msg":"same warn message","obj":{"Name":"obj name","IsEnable":false},"level":"warning","go-version":"go1.21.5"}
|
// {"msg":"same warn message","obj":{"Name":"obj name","IsEnable":false},"level":"warning","go-version":"go1.25.5"}
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExampleNew_textEncoding() {
|
func ExampleNew_textEncoding() {
|
||||||
@@ -227,8 +227,8 @@ func ExampleNew_textEncoding() {
|
|||||||
logger.InfoKVs(ctx, "same info message", "api-version", 0.1, "obj", Obj{Name: "text value", IsEnable: true})
|
logger.InfoKVs(ctx, "same info message", "api-version", 0.1, "obj", Obj{Name: "text value", IsEnable: true})
|
||||||
|
|
||||||
// Output:
|
// Output:
|
||||||
// msg="same error message" level=error go-version=go1.21.5
|
// msg="same error message" level=error go-version=go1.25.5
|
||||||
// msg="same info message" api-version=0.1 obj={Name:text value IsEnable:true} level=info go-version=go1.21.5
|
// msg="same info message" api-version=0.1 obj={Name:text value IsEnable:true} level=info go-version=go1.25.5
|
||||||
}
|
}
|
||||||
|
|
||||||
type ctxKey string
|
type ctxKey string
|
||||||
@@ -243,6 +243,7 @@ func levelInfo(ctx context.Context, entry *entry.Entry, handler log.Logger) (int
|
|||||||
|
|
||||||
func ExampleWith() {
|
func ExampleWith() {
|
||||||
var requestID ctxKey = "requestID"
|
var requestID ctxKey = "requestID"
|
||||||
|
|
||||||
vctx := context.WithValue(ctx, requestID, "6a5fa048-7181-11ea-bc55-0242ac130003")
|
vctx := context.WithValue(ctx, requestID, "6a5fa048-7181-11ea-bc55-0242ac130003")
|
||||||
|
|
||||||
logger := log.New(log.WithStdout()).With(
|
logger := log.New(log.WithStdout()).With(
|
||||||
@@ -252,7 +253,7 @@ func ExampleWith() {
|
|||||||
log.GoVersion("go"),
|
log.GoVersion("go"),
|
||||||
)
|
)
|
||||||
logger.Info(vctx, "same message")
|
logger.Info(vctx, "same message")
|
||||||
// Output: msg="same message" level=info requestID=6a5fa048-7181-11ea-bc55-0242ac130003 api=0.1.0 go=go1.21.5
|
// Output: msg="same message" level=info requestID=6a5fa048-7181-11ea-bc55-0242ac130003 api=0.1.0 go=go1.25.5
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExampleLogger_Print() {
|
func ExampleLogger_Print() {
|
||||||
@@ -263,7 +264,7 @@ func ExampleLogger_Print() {
|
|||||||
log.GoVersion("go"),
|
log.GoVersion("go"),
|
||||||
)
|
)
|
||||||
logger.Print("same message")
|
logger.Print("same message")
|
||||||
// Output: msg="same message" level=info client=http api=0.1.0 go=go1.21.5
|
// Output: msg="same message" level=info client=http api=0.1.0 go=go1.25.5
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExamplePrint() {
|
func ExamplePrint() {
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ func With(logger Logger, mw ...Middleware) Logger {
|
|||||||
if curI == lastI {
|
if curI == lastI {
|
||||||
return logger(currentCtx, currentEntry)
|
return logger(currentCtx, currentEntry)
|
||||||
}
|
}
|
||||||
|
|
||||||
curI++
|
curI++
|
||||||
n, err := mw[curI](currentCtx, currentEntry, chainHandler)
|
n, err := mw[curI](currentCtx, currentEntry, chainHandler)
|
||||||
curI--
|
curI--
|
||||||
@@ -61,7 +62,7 @@ func WithLevel(key string, lvl level.Level) Middleware {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// KeyValue add field by const key value.
|
// KeyValue add field by const key value.
|
||||||
func KeyValue(key string, value interface{}) Middleware {
|
func KeyValue(key string, value any) Middleware {
|
||||||
return func(ctx context.Context, e *entry.Entry, handler Logger) (int, error) {
|
return func(ctx context.Context, e *entry.Entry, handler Logger) (int, error) {
|
||||||
return handler(ctx, e.AddAny(key, value))
|
return handler(ctx, e.AddAny(key, value))
|
||||||
}
|
}
|
||||||
@@ -74,7 +75,7 @@ func GoVersion(key string) Middleware {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithContext add field by context key.
|
// WithContextValue add field by context key.
|
||||||
func WithContextValue(keys ...fmt.Stringer) Middleware {
|
func WithContextValue(keys ...fmt.Stringer) Middleware {
|
||||||
return func(ctx context.Context, e *entry.Entry, handler Logger) (int, error) {
|
return func(ctx context.Context, e *entry.Entry, handler Logger) (int, error) {
|
||||||
for _, key := range keys {
|
for _, key := range keys {
|
||||||
@@ -92,6 +93,7 @@ func WithName(name string) Middleware {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// WithCaller adds called file.
|
// WithCaller adds called file.
|
||||||
|
//
|
||||||
// Deprecated: use WithSource.
|
// Deprecated: use WithSource.
|
||||||
func WithCaller(key string, depth int, full bool) Middleware {
|
func WithCaller(key string, depth int, full bool) Middleware {
|
||||||
const offset = 2
|
const offset = 2
|
||||||
|
|||||||
@@ -82,13 +82,13 @@ type Source struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (l Source) MarshalText() ([]byte, error) {
|
func (l Source) MarshalText() ([]byte, error) {
|
||||||
return []byte(fmt.Sprintf("%s:%d", l.File, l.Line)), nil
|
return fmt.Appendf(nil, "%s:%d", l.File, l.Line), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l Source) MarshalJSON() ([]byte, error) {
|
func (l Source) MarshalJSON() ([]byte, error) {
|
||||||
return fmt.Appendf([]byte{}, `{"file":"%s","line":%d,"func":"%s"}`, l.File, l.Line, l.Func), nil
|
return fmt.Appendf([]byte{}, `{"file":"%s","line":%d,"func":"%s"}`, l.File, l.Line, l.Func), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func errSourceField(skip, max int) field.Field {
|
func errSourceField(skip, mframe int) field.Field {
|
||||||
return field.String(KeySource, fmt.Sprintf("source not found by frames[%d:%d]", skip, max))
|
return field.String(KeySource, fmt.Sprintf("source not found by frames[%d:%d]", skip, mframe))
|
||||||
}
|
}
|
||||||
|
|||||||
37
writer_example_test.go
Normal file
37
writer_example_test.go
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
package log_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"math"
|
||||||
|
"path/filepath"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gitoa.ru/go-4devs/log"
|
||||||
|
"gitoa.ru/go-4devs/log/entry"
|
||||||
|
"gitoa.ru/go-4devs/log/field"
|
||||||
|
"gitoa.ru/go-4devs/log/level"
|
||||||
|
)
|
||||||
|
|
||||||
|
func exampleWithTime(key, format string) log.Middleware {
|
||||||
|
return func(ctx context.Context, e *entry.Entry, handler log.Logger) (int, error) {
|
||||||
|
return handler(ctx, e.Add(field.FormatTime(key, format, time.Unix(math.MaxInt32, 0).In(time.UTC))))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func ExampleFormatWithBracket() {
|
||||||
|
ctx := context.Background()
|
||||||
|
logger := log.New(log.WithFormat(log.FormatWithBracket(field.NewEncoderText())), log.WithStdout()).With(
|
||||||
|
log.WithSource(10, filepath.Base),
|
||||||
|
// log.WithTime(log.KeyTime, time.RFC3339),
|
||||||
|
exampleWithTime(log.KeyTime, time.RFC3339),
|
||||||
|
log.WithLevel(log.KeyLevel, level.Info),
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.InfoKV(ctx, "imfo message", field.Int64("num", 42))
|
||||||
|
|
||||||
|
serviceLogger := logger.With(log.WithName("service_name"))
|
||||||
|
serviceLogger.Err(ctx, "error message")
|
||||||
|
// Output:
|
||||||
|
// 2038-01-19T03:14:07Z [info] writer_example_test.go:30 "imfo message" num=42
|
||||||
|
// 2038-01-19T03:14:07Z [error][service_name] writer_example_test.go:33 "error message"
|
||||||
|
}
|
||||||
87
writter.go
87
writter.go
@@ -13,16 +13,16 @@ import (
|
|||||||
|
|
||||||
// Keys for "built-in" attributes.
|
// Keys for "built-in" attributes.
|
||||||
const (
|
const (
|
||||||
// TimeKey is the key used by the built-in handlers for the time
|
// KeyTime is the key used by the built-in handlers for the time
|
||||||
// when the log method is called. The associated Value is a [time.Time].
|
// when the log method is called. The associated Value is a [time.Time].
|
||||||
KeyTime = "time"
|
KeyTime = "time"
|
||||||
// LevelKey is the key used by the built-in handlers for the level
|
// KeyLevel is the key used by the built-in handlers for the level
|
||||||
// of the log call. The associated value is a [Level].
|
// of the log call. The associated value is a [Level].
|
||||||
KeyLevel = "level"
|
KeyLevel = "level"
|
||||||
// MessageKey is the key used by the built-in handlers for the
|
// KeyMessage is the key used by the built-in handlers for the
|
||||||
// message of the log call. The associated value is a string.
|
// message of the log call. The associated value is a string.
|
||||||
KeyMessage = "msg"
|
KeyMessage = "msg"
|
||||||
// SourceKey is the key used by the built-in handlers for the source file
|
// KeySource is the key used by the built-in handlers for the source file
|
||||||
// and line of the log call. The associated value is a string.
|
// and line of the log call. The associated value is a string.
|
||||||
KeySource = "source"
|
KeySource = "source"
|
||||||
// KeyName logger name.
|
// KeyName logger name.
|
||||||
@@ -43,15 +43,18 @@ func WithStdout() func(*option) {
|
|||||||
|
|
||||||
// WithStringFormat sets format as simple string.
|
// WithStringFormat sets format as simple string.
|
||||||
func WithStringFormat() func(*option) {
|
func WithStringFormat() func(*option) {
|
||||||
return func(o *option) {
|
return WithFormat(FormatString(field.NewEncoderText()))
|
||||||
o.format = formatText()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithJSONFormat sets json output format.
|
// WithJSONFormat sets json output format.
|
||||||
func WithJSONFormat() func(*option) {
|
func WithJSONFormat() func(*option) {
|
||||||
|
return WithFormat(FormatJSON(field.NewEncoderJSON()))
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithFormat sets custom output format.
|
||||||
|
func WithFormat(format func(io.Writer, *entry.Entry) (int, error)) func(*option) {
|
||||||
return func(o *option) {
|
return func(o *option) {
|
||||||
o.format = formatJSON()
|
o.format = format
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,7 +66,7 @@ type option struct {
|
|||||||
// New creates standart logger.
|
// New creates standart logger.
|
||||||
func New(opts ...func(*option)) Logger {
|
func New(opts ...func(*option)) Logger {
|
||||||
log := option{
|
log := option{
|
||||||
format: formatText(),
|
format: FormatString(field.NewEncoderText()),
|
||||||
out: os.Stderr,
|
out: os.Stderr,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,11 +79,68 @@ func New(opts ...func(*option)) Logger {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func formatText() func(io.Writer, *entry.Entry) (int, error) {
|
type Encoder interface {
|
||||||
enc := field.NewEncoderText()
|
AppendValue(dst []byte, val field.Value) []byte
|
||||||
|
AppendField(dst []byte, val field.Field) []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
func FormatWithBracket(enc Encoder) func(io.Writer, *entry.Entry) (int, error) {
|
||||||
|
appendValue := func(buf *buffer.Buffer, data field.Fields, key, prefix, suffix string) *buffer.Buffer {
|
||||||
|
data.Fields(
|
||||||
|
func(f field.Field) bool {
|
||||||
|
if f.IsKey(key) {
|
||||||
|
_, _ = buf.WriteString(prefix)
|
||||||
|
*buf = enc.AppendValue(*buf, f.Value)
|
||||||
|
_, _ = buf.WriteString(suffix)
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
|
||||||
|
return buf
|
||||||
|
}
|
||||||
|
|
||||||
|
return func(w io.Writer, data *entry.Entry) (int, error) {
|
||||||
|
buf := buffer.New()
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
buf.Free()
|
||||||
|
}()
|
||||||
|
|
||||||
|
fields := data.Fields()
|
||||||
|
buf = appendValue(buf, fields, KeyTime, "", " ")
|
||||||
|
_, _ = buf.WriteString("[")
|
||||||
|
*buf = enc.AppendValue(*buf, field.StringValue(data.Level().String()))
|
||||||
|
_, _ = buf.WriteString("]")
|
||||||
|
buf = appendValue(buf, fields, KeyName, "[", "]")
|
||||||
|
buf = appendValue(buf, fields, KeySource, " ", " ")
|
||||||
|
*buf = enc.AppendValue(*buf, field.StringValue(data.Message()))
|
||||||
|
|
||||||
|
fields.Fields(func(f field.Field) bool {
|
||||||
|
if !f.IsKey(KeyTime, KeySource, KeyName, KeyLevel) {
|
||||||
|
*buf = enc.AppendField(*buf, f)
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
|
||||||
|
_, _ = buf.WriteString("\n")
|
||||||
|
|
||||||
|
n, err := w.Write(*buf)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("format text:%w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return n, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func FormatString(enc Encoder) func(io.Writer, *entry.Entry) (int, error) {
|
||||||
return func(w io.Writer, entry *entry.Entry) (int, error) {
|
return func(w io.Writer, entry *entry.Entry) (int, error) {
|
||||||
buf := buffer.New()
|
buf := buffer.New()
|
||||||
|
|
||||||
defer func() {
|
defer func() {
|
||||||
buf.Free()
|
buf.Free()
|
||||||
}()
|
}()
|
||||||
@@ -102,11 +162,10 @@ func formatText() func(io.Writer, *entry.Entry) (int, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func formatJSON() func(w io.Writer, entry *entry.Entry) (int, error) {
|
func FormatJSON(enc Encoder) func(w io.Writer, entry *entry.Entry) (int, error) {
|
||||||
enc := field.NewEncoderJSON()
|
|
||||||
|
|
||||||
return func(w io.Writer, entry *entry.Entry) (int, error) {
|
return func(w io.Writer, entry *entry.Entry) (int, error) {
|
||||||
buf := buffer.New()
|
buf := buffer.New()
|
||||||
|
|
||||||
defer func() {
|
defer func() {
|
||||||
buf.Free()
|
buf.Free()
|
||||||
}()
|
}()
|
||||||
|
|||||||
Reference in New Issue
Block a user