mirror of
https://github.com/foxcpp/maddy.git
synced 2025-04-05 05:57:39 +03:00
bf188e454f
The intention is to keep to repo root clean while the list of packages is slowly growing. Additionally, a bunch of small (~30 LoC) files in the repo root is merged into a single maddy.go file, for the same reason. Most of the internal code is moved into the internal/ directory. Go toolchain will make it impossible to import these packages from external applications. Some packages are renamed and moved into the pkg/ directory in the root. According to https://github.com/golang-standards/project-layout this is the de-facto standard to place "library code that's ok to use by external applications" in. To clearly define the purpose of top-level directories, README.md files are added to each.
56 lines
962 B
Go
56 lines
962 B
Go
package exterrors
|
|
|
|
type fieldsErr interface {
|
|
Fields() map[string]interface{}
|
|
}
|
|
|
|
type unwrapper interface {
|
|
Unwrap() error
|
|
}
|
|
|
|
type fieldsWrap struct {
|
|
err error
|
|
fields map[string]interface{}
|
|
}
|
|
|
|
func (fw fieldsWrap) Error() string {
|
|
return fw.err.Error()
|
|
}
|
|
|
|
func (fw fieldsWrap) Unwrap() error {
|
|
return fw.err
|
|
}
|
|
|
|
func (fw fieldsWrap) Fields() map[string]interface{} {
|
|
return fw.fields
|
|
}
|
|
|
|
func Fields(err error) map[string]interface{} {
|
|
fields := make(map[string]interface{}, 5)
|
|
|
|
for err != nil {
|
|
errFields, ok := err.(fieldsErr)
|
|
if ok {
|
|
for k, v := range errFields.Fields() {
|
|
// Outer errors override fields of the inner ones.
|
|
// Not the reverse.
|
|
if fields[k] != nil {
|
|
continue
|
|
}
|
|
fields[k] = v
|
|
}
|
|
}
|
|
|
|
unwrap, ok := err.(unwrapper)
|
|
if !ok {
|
|
break
|
|
}
|
|
err = unwrap.Unwrap()
|
|
}
|
|
|
|
return fields
|
|
}
|
|
|
|
func WithFields(err error, fields map[string]interface{}) error {
|
|
return fieldsWrap{err: err, fields: fields}
|
|
}
|