updated dependencies and go
This commit is contained in:
+32
-30
@@ -2,9 +2,9 @@ package exerr
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
|
||||
"github.com/rs/xid"
|
||||
"github.com/rs/zerolog"
|
||||
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
|
||||
"reflect"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -125,35 +125,37 @@ func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
|
||||
|
||||
} else if lvl == LogPrintOverview {
|
||||
|
||||
str := "[" + ee.RecursiveType().Key + "] <" + ee.UniqueID + "> " + strings.ReplaceAll(ee.RecursiveMessage(), "\n", " ") + "\n"
|
||||
var str strings.Builder
|
||||
str.WriteString("[" + ee.RecursiveType().Key + "] <" + ee.UniqueID + "> " + strings.ReplaceAll(ee.RecursiveMessage(), "\n", " ") + "\n")
|
||||
|
||||
for exk, exv := range ee.Extra {
|
||||
str += fmt.Sprintf(" # [[[ %s ==> %v ]]]\n", exk, exv)
|
||||
str.WriteString(fmt.Sprintf(" # [[[ %s ==> %v ]]]\n", exk, exv))
|
||||
}
|
||||
|
||||
indent := ""
|
||||
var indent strings.Builder
|
||||
for curr := ee; curr != nil; curr = curr.OriginalError {
|
||||
indent += " "
|
||||
indent.WriteString(" ")
|
||||
|
||||
str += indent
|
||||
str += "-> "
|
||||
str.WriteString(indent).String()
|
||||
str.WriteString("-> ")
|
||||
strmsg := strings.Trim(curr.Message, " \r\n\t")
|
||||
if lbidx := strings.Index(curr.Message, "\n"); lbidx >= 0 {
|
||||
strmsg = strmsg[0:lbidx]
|
||||
}
|
||||
strmsg = langext.StrLimit(strmsg, 61, "...")
|
||||
str += strmsg
|
||||
str += "\n"
|
||||
str.WriteString(strmsg)
|
||||
str.WriteString("\n")
|
||||
|
||||
}
|
||||
return str
|
||||
return str.String()
|
||||
|
||||
} else if lvl == LogPrintFull {
|
||||
|
||||
str := "[" + ee.RecursiveType().Key + "] <" + ee.UniqueID + "> " + strings.ReplaceAll(ee.RecursiveMessage(), "\n", " ") + "\n"
|
||||
var str strings.Builder
|
||||
str.WriteString("[" + ee.RecursiveType().Key + "] <" + ee.UniqueID + "> " + strings.ReplaceAll(ee.RecursiveMessage(), "\n", " ") + "\n")
|
||||
|
||||
for exk, exv := range ee.Extra {
|
||||
str += fmt.Sprintf(" # [[[ %s ==> %v ]]]\n", exk, exv)
|
||||
str.WriteString(fmt.Sprintf(" # [[[ %s ==> %v ]]]\n", exk, exv))
|
||||
}
|
||||
|
||||
indent := ""
|
||||
@@ -165,33 +167,33 @@ func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
|
||||
etype = "~"
|
||||
}
|
||||
|
||||
str += indent
|
||||
str += "-> ["
|
||||
str += etype
|
||||
str.WriteString(indent)
|
||||
str.WriteString("-> [")
|
||||
str.WriteString(etype)
|
||||
if curr.Category == CatForeign {
|
||||
str += "|Foreign"
|
||||
str.WriteString("|Foreign")
|
||||
}
|
||||
str += "] "
|
||||
str += strings.ReplaceAll(curr.Message, "\n", " ")
|
||||
str.WriteString("] ")
|
||||
str.WriteString(strings.ReplaceAll(curr.Message, "\n", " "))
|
||||
if curr.Caller != "" {
|
||||
str += " (@ "
|
||||
str += curr.Caller
|
||||
str += ")"
|
||||
str.WriteString(" (@ ")
|
||||
str.WriteString(curr.Caller)
|
||||
str.WriteString(")")
|
||||
}
|
||||
str += "\n"
|
||||
str.WriteString("\n")
|
||||
|
||||
if curr.Meta.Any() {
|
||||
meta := indent + " {" + curr.Meta.FormatOneLine(240) + "}"
|
||||
if len(meta) < 200 {
|
||||
str += meta
|
||||
str += "\n"
|
||||
str.WriteString(meta)
|
||||
str.WriteString("\n")
|
||||
} else {
|
||||
str += curr.Meta.FormatMultiLine(indent+" ", " ", 1024)
|
||||
str += "\n"
|
||||
str.WriteString(curr.Meta.FormatMultiLine(indent+" ", " ", 1024))
|
||||
str.WriteString("\n")
|
||||
}
|
||||
}
|
||||
}
|
||||
return str
|
||||
return str.String()
|
||||
|
||||
} else {
|
||||
|
||||
@@ -201,7 +203,7 @@ func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
|
||||
}
|
||||
|
||||
func (ee *ExErr) ShortLog(evt *zerolog.Event) {
|
||||
ee.Meta.Apply(evt, langext.Ptr(240)).Msg(ee.FormatLog(LogPrintShort))
|
||||
ee.Meta.Apply(evt, new(240)).Msg(ee.FormatLog(LogPrintShort))
|
||||
}
|
||||
|
||||
// RecursiveMessage returns the message to show
|
||||
@@ -254,7 +256,7 @@ func (ee *ExErr) RecursiveType() ErrorType {
|
||||
func (ee *ExErr) RecursiveStatuscode() *int {
|
||||
for curr := ee; curr != nil; curr = curr.OriginalError {
|
||||
if curr.StatusCode != nil {
|
||||
return langext.Ptr(*curr.StatusCode)
|
||||
return new(*curr.StatusCode)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -279,7 +281,7 @@ func (ee *ExErr) RecursiveCategory() ErrorCategory {
|
||||
func (ee *ExErr) RecursiveMeta(key string) *MetaValue {
|
||||
for curr := ee; curr != nil; curr = curr.OriginalError {
|
||||
if metaval, ok := curr.Meta[key]; ok {
|
||||
return langext.Ptr(metaval)
|
||||
return new(metaval)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user