public/jldb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 17 Wiki Activity

Updated error type

Browse Source
This commit is contained in:
jdl 2023-12-05 11:24:03 +01:00
parent 54c9e89c3e
commit 13e53f0c88
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/errs/error.go
View File

@ -8,26 +8,27 @@ import (
) )
type Error struct { type Error struct {
msg string Code int64
code int64 Msg string
StackTrace string
collection string collection string
index string index string
stackTrace string
err error // Wrapped error err error // Wrapped error
} }
func NewErr(code int64, msg string) *Error { func NewErr(code int64, msg string) *Error {
return &Error{ return &Error{
msg: msg, Code: code,
code: code, Msg: msg,
} }
} }
func (e *Error) Error() string { func (e *Error) Error() string {
if e.collection != "" || e.index != "" { if e.collection != "" || e.index != "" {
return fmt.Sprintf(`[%d] (%s/%s) %s`, e.code, e.collection, e.index, e.msg) return fmt.Sprintf(`[%d] (%s/%s) %s`, e.Code, e.collection, e.index, e.Msg)
} else { } else {
return fmt.Sprintf("[%d] %s", e.code, e.msg) return fmt.Sprintf("[%d] %s", e.Code, e.Msg)
} }
} }
@ -36,11 +37,15 @@ func (e *Error) Is(rhs error) bool {
if !ok { if !ok {
return false return false
} }
return e.code == e2.code return e.Code == e2.Code
}
func (e *Error) Unwrap() error {
return e.err
} }
func (e *Error) WithErr(err error) *Error { func (e *Error) WithErr(err error) *Error {
if e2, ok := err.(*Error); ok && e2.code == e.code { if e2, ok := err.(*Error); ok && e2.Code == e.Code {
return e2 return e2
} }
@ -49,15 +54,11 @@ func (e *Error) WithErr(err error) *Error {
return e2 return e2
} }
func (e *Error) Unwrap() error {
return e.err
}
func (e *Error) WithMsg(msg string, args ...any) *Error { func (e *Error) WithMsg(msg string, args ...any) *Error {
err := *e err := *e
err.msg += ": " + fmt.Sprintf(msg, args...) err.Msg += ": " + fmt.Sprintf(msg, args...)
if len(err.stackTrace) == 0 { if len(err.StackTrace) == 0 {
err.stackTrace = string(debug.Stack()) err.StackTrace = string(debug.Stack())
} }
return &err return &err
} }
@ -75,16 +76,16 @@ func (e *Error) WithIndex(s string) *Error {
} }
func (e *Error) msgTruncacted() string { func (e *Error) msgTruncacted() string {
if len(e.msg) > 255 { if len(e.Msg) > 255 {
return e.msg[:255] return e.Msg[:255]
} }
return e.msg return e.Msg
} }
func (e *Error) Write(w io.Writer) error { func (e *Error) Write(w io.Writer) error {
msg := e.msgTruncacted() msg := e.msgTruncacted()
if err := binary.Write(w, binary.LittleEndian, e.code); err != nil { if err := binary.Write(w, binary.LittleEndian, e.Code); err != nil {
return IO.WithErr(err) return IO.WithErr(err)
} }
@ -100,7 +101,7 @@ func (e *Error) Read(r io.Reader) error {
size uint8 size uint8
) )
if err := binary.Read(r, binary.LittleEndian, &e.code); err != nil { if err := binary.Read(r, binary.LittleEndian, &e.Code); err != nil {
return IO.WithErr(err) return IO.WithErr(err)
} }
@ -113,6 +114,6 @@ func (e *Error) Read(r io.Reader) error {
return IO.WithErr(err) return IO.WithErr(err)
} }
e.msg = string(msgBuf) e.Msg = string(msgBuf)
return nil return nil
} }

8
lib/errs/fmt.go
View File

@ -10,12 +10,12 @@ func FmtDetails(err error) string {
var s string var s string
if e.collection != "" || e.index != "" { if e.collection != "" || e.index != "" {
s = fmt.Sprintf(`[%d] (%s/%s) %s`, e.code, e.collection, e.index, e.msg) s = fmt.Sprintf(`[%d] (%s/%s) %s`, e.Code, e.collection, e.index, e.Msg)
} else { } else {
s = fmt.Sprintf("[%d] %s", e.code, e.msg) s = fmt.Sprintf("[%d] %s", e.Code, e.Msg)
} }
if len(e.stackTrace) != 0 { if len(e.StackTrace) != 0 {
s += "\n\nStack Trace:\n" + e.stackTrace + "\n" s += "\n\nStack Trace:\n" + e.StackTrace + "\n"
} }
return s return s