-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathlogerr.go
More file actions
96 lines (79 loc) · 1.56 KB
/
Copy pathlogerr.go
File metadata and controls
96 lines (79 loc) · 1.56 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
package logerr
import (
"errors"
"fmt"
"strings"
"github.com/sirupsen/logrus"
)
func Entry(err error, fields ...logrus.Fields) *logrus.Entry {
return logrus.WithFields(getFields(WithFields(err, fields...)))
}
func WithFields(err error, fields ...logrus.Fields) error {
if err == nil {
return nil
}
return &logrusError{
err: fmt.Errorf("%w", err),
fields: MergeFields(fields...),
}
}
func MergeFields(fields ...logrus.Fields) logrus.Fields {
merged := make(logrus.Fields)
for i := range fields {
for k, v := range fields[i] {
merged[k] = v
}
}
return merged
}
type logrusErrorer interface {
error
GetFields() logrus.Fields
}
type logrusError struct {
err error
fields logrus.Fields
}
func (e *logrusError) GetFields() logrus.Fields {
if e == nil {
return nil
}
return e.fields
}
func (e *logrusError) Error() string {
if e == nil {
return ""
}
return e.err.Error()
}
func (e *logrusError) Unwrap() error {
if e == nil || e.err == nil {
return nil
}
return e.err
}
func getFields(err error) logrus.Fields {
var e logrusErrorer
if errors.As(err, &e) {
return mergeFieldsWithFuncs(getFields(errors.Unwrap(e)), e.GetFields())
}
return nil
}
func mergeFieldsWithFuncs(fields ...logrus.Fields) logrus.Fields {
merged := make(logrus.Fields)
var funcs []string
for i := range fields {
for k, v := range fields[i] {
if k != "func" {
merged[k] = v
continue
}
funk, ok := v.(string)
if ok && funk != "" {
funcs = append(funcs, funk)
}
}
}
merged["func"] = strings.Join(funcs, ",")
return merged
}