BlackForestBytes/goext
20
0
Fork 0
Code Actions

v0.0.254 revert back to 0.0.250
All checks were successful
Build Docker and Deploy / Run goext test-suite (push) Successful in 1m14s
Details

Browse Source
This commit is contained in:
Mike Schwörer 2023-08-22 10:49:57 +02:00
parent 9e5bc0d3ea
commit 113d838876
Signed by: Mikescher
GPG Key ID: D3C7172E0A70F8CF
3 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
exerr/builder.go
View File

@ -112,13 +112,6 @@ func (b *Builder) WithMessage(msg string) *Builder {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
func (b *Builder) WithStackSkip(stacktraceskip int) *Builder {
b.errorData.Caller = callername(stacktraceskip)
return b
}
// ----------------------------------------------------------------------------
// Err changes the Severity to ERROR (default) // Err changes the Severity to ERROR (default)
// The error will be: // The error will be:
// //

16
exerr/exerr.go
View File

@ -4,10 +4,7 @@ import (
"github.com/rs/xid" "github.com/rs/xid"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"gogs.mikescher.com/BlackForestBytes/goext/langext" "gogs.mikescher.com/BlackForestBytes/goext/langext"
"gogs.mikescher.com/BlackForestBytes/goext/rext"
"reflect" "reflect"
"regexp"
"strconv"
"strings" "strings"
"time" "time"
) )
@ -80,10 +77,7 @@ func (ee *ExErr) As(target any) bool {
} }
func (ee *ExErr) Log(evt *zerolog.Event) { func (ee *ExErr) Log(evt *zerolog.Event) {
backup := zerolog.CallerMarshalFunc
zerolog.CallerMarshalFunc = customZerologCallerMarshalFunc
evt.Msg(ee.FormatLog(LogPrintFull)) evt.Msg(ee.FormatLog(LogPrintFull))
zerolog.CallerMarshalFunc = backup
} }
func (ee *ExErr) FormatLog(lvl LogPrintLevel) string { func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
@ -170,10 +164,7 @@ func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
} }
func (ee *ExErr) ShortLog(evt *zerolog.Event) { func (ee *ExErr) ShortLog(evt *zerolog.Event) {
backup := zerolog.CallerMarshalFunc
zerolog.CallerMarshalFunc = customZerologCallerMarshalFunc
ee.Meta.Apply(evt).Msg(ee.FormatLog(LogPrintShort)) ee.Meta.Apply(evt).Msg(ee.FormatLog(LogPrintShort))
zerolog.CallerMarshalFunc = backup
} }
// RecursiveMessage returns the message to show // RecursiveMessage returns the message to show
@ -305,10 +296,3 @@ func (ee *ExErr) equalsDirectProperties(other *ExErr) bool {
func newID() string { func newID() string {
return xid.New().String() return xid.New().String()
} }
var regexZerologCallerClean = rext.W(regexp.MustCompile(`^(\.\./)*/?go/pkg/mod/gogs\.(mikescher|blackforestbytes)\.(com|de)/!black!forest!bytes/?`))
func customZerologCallerMarshalFunc(pc uintptr, file string, line int) string {
file = regexZerologCallerClean.ReplaceAll(file, "", true)
return file + ":" + strconv.Itoa(line)
}

4
goextVersion.go
View File

@ -1,5 +1,5 @@
package goext package goext
const GoextVersion = "0.0.253" const GoextVersion = "0.0.254"
const GoextVersionTimestamp = "2023-08-22T10:36:35+0200" const GoextVersionTimestamp = "2023-08-22T10:49:57+0200"