v0.0.474 Add ZeroLogger config field to exerr.Init to override used zerolog instance

cursortoken/filter.go

@@ -1,14 +1,15 @@
 package cursortoken
 
 import (
+	"context"
 	"go.mongodb.org/mongo-driver/mongo"
 )
 
 type RawFilter interface {
-	FilterQuery() mongo.Pipeline
+	FilterQuery(ctx context.Context) mongo.Pipeline
 }
 
 type Filter interface {
-	FilterQuery() mongo.Pipeline
-	Pagination() (string, SortDirection, string, SortDirection)
+	FilterQuery(ctx context.Context) mongo.Pipeline
+	Pagination(ctx context.Context) (string, SortDirection, string, SortDirection)
 }

exerr/builder.go

@@ -55,18 +55,6 @@ import (
 //     => Wrap/New + Fatal
 //
 
-var stackSkipLogger zerolog.Logger
-
-func init() {
-	cw := zerolog.ConsoleWriter{
-		Out:        os.Stdout,
-		TimeFormat: "2006-01-02 15:04:05 Z07:00",
-	}
-
-	multi := zerolog.MultiLevelWriter(cw)
-	stackSkipLogger = zerolog.New(multi).With().Timestamp().CallerWithSkipFrameCount(4).Logger()
-}
-
 type Builder struct {
 	wrappedErr          error
 	errorData           *ExErr
@@ -435,9 +423,9 @@ func (b *Builder) Build(ctxs ...context.Context) error {
 	}
 
 	if pkgconfig.ZeroLogErrTraces && !b.noLog && (b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal) {
-		b.errorData.ShortLog(stackSkipLogger.Error())
+		b.errorData.ShortLog(pkgconfig.ZeroLogger.Error())
 	} else if pkgconfig.ZeroLogAllTraces && !b.noLog {
-		b.errorData.ShortLog(stackSkipLogger.Error())
+		b.errorData.ShortLog(pkgconfig.ZeroLogger.Error())
 	}
 
 	b.errorData.CallListener(MethodBuild)
@@ -459,9 +447,9 @@ func (b *Builder) Output(ctx context.Context, g *gin.Context) {
 	b.errorData.Output(g)
 
 	if (b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal) && (pkgconfig.ZeroLogErrGinOutput || pkgconfig.ZeroLogAllGinOutput) {
-		b.errorData.Log(stackSkipLogger.Error())
+		b.errorData.Log(pkgconfig.ZeroLogger.Error())
 	} else if (b.errorData.Severity == SevWarn) && (pkgconfig.ZeroLogAllGinOutput) {
-		b.errorData.Log(stackSkipLogger.Warn())
+		b.errorData.Log(pkgconfig.ZeroLogger.Warn())
 	}
 
 	b.errorData.CallListener(MethodOutput)
@@ -477,9 +465,9 @@ func (b *Builder) Print(ctxs ...context.Context) {
 	}
 
 	if b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal {
-		b.errorData.Log(stackSkipLogger.Error())
+		b.errorData.Log(pkgconfig.ZeroLogger.Error())
 	} else if b.errorData.Severity == SevWarn {
-		b.errorData.ShortLog(stackSkipLogger.Warn())
+		b.errorData.ShortLog(pkgconfig.ZeroLogger.Warn())
 	}
 
 	b.errorData.CallListener(MethodPrint)
@@ -499,7 +487,7 @@ func (b *Builder) Fatal(ctxs ...context.Context) {
 		b.CtxData(MethodFatal, dctx)
 	}
 
-	b.errorData.Log(stackSkipLogger.WithLevel(zerolog.FatalLevel))
+	b.errorData.Log(pkgconfig.ZeroLogger.WithLevel(zerolog.FatalLevel))
 
 	b.errorData.CallListener(MethodFatal)
 

exerr/errinit.go

@@ -4,8 +4,10 @@ import (
 	"context"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"github.com/rs/zerolog"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"net/http"
+	"os"
 )
 
 type ErrorPackageConfig struct {
@@ -21,6 +23,7 @@ type ErrorPackageConfig struct {
 	ZeroLogAllGinOutput    bool                                                                     // autom print zerolog logs on ginext.Error() / .Output(gin)  (for all Severities)
 	ExtendGinMeta          func(ctx context.Context, b *Builder, g *gin.Context, req *http.Request) // (Optionally) extend the final error meta values with additional data from the gin context (a few are automatically added, here more can be included)
 	ExtendContextMeta      func(b *Builder, method Method, dctx context.Context)                    // (Optionally) extend the final error meta values with additional data from the context (a few are automatically added, here more can be included)
+	ZeroLogger             zerolog.Logger                                                           // The logger used to print exerr log messages
 }
 
 type ErrorPackageConfigInit struct {
@@ -36,6 +39,7 @@ type ErrorPackageConfigInit struct {
 	ZeroLogAllGinOutput    *bool
 	ExtendGinMeta          func(ctx context.Context, b *Builder, g *gin.Context, req *http.Request)
 	ExtendContextMeta      func(b *Builder, method Method, dctx context.Context)
+	ZeroLogger             *zerolog.Logger
 }
 
 var initialized = false
@@ -81,6 +85,13 @@ func Init(cfg ErrorPackageConfigInit) {
 		egcm = cfg.ExtendContextMeta
 	}
 
+	var logger zerolog.Logger
+	if cfg.ZeroLogger != nil {
+		logger = *cfg.ZeroLogger
+	} else {
+		logger = newDefaultLogger()
+	}
+
 	pkgconfig = ErrorPackageConfig{
 		ZeroLogErrTraces:       langext.Coalesce(cfg.ZeroLogErrTraces, pkgconfig.ZeroLogErrTraces),
 		ZeroLogAllTraces:       langext.Coalesce(cfg.ZeroLogAllTraces, pkgconfig.ZeroLogAllTraces),
@@ -94,11 +105,23 @@ func Init(cfg ErrorPackageConfigInit) {
 		ZeroLogErrGinOutput:    langext.Coalesce(cfg.ZeroLogErrGinOutput, pkgconfig.ZeroLogErrGinOutput),
 		ExtendGinMeta:          egm,
 		ExtendContextMeta:      egcm,
+		ZeroLogger:             logger,
 	}
 
 	initialized = true
 }
 
+func newDefaultLogger() zerolog.Logger {
+	cw := zerolog.ConsoleWriter{
+		Out:        os.Stdout,
+		TimeFormat: "2006-01-02 15:04:05 Z07:00",
+	}
+
+	multi := zerolog.MultiLevelWriter(cw)
+
+	return zerolog.New(multi).With().Timestamp().CallerWithSkipFrameCount(4).Logger()
+}
+
 func Initialized() bool {
 	return initialized
 }

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.472"
+const GoextVersion = "0.0.474"
 
-const GoextVersionTimestamp = "2024-06-14T14:56:41+0200"
+const GoextVersionTimestamp = "2024-06-14T23:18:58+0200"

pagination/filter.go

@@ -1,13 +1,14 @@
 package pagination
 
 import (
+	"context"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 )
 
 type MongoFilter interface {
-	FilterQuery() mongo.Pipeline
-	Sort() bson.D
+	FilterQuery(ctx context.Context) mongo.Pipeline
+	Sort(ctx context.Context) bson.D
 }
 
 type dynamicFilter struct {
@@ -15,11 +16,11 @@ type dynamicFilter struct {
 	sort     bson.D
 }
 
-func (d dynamicFilter) FilterQuery() mongo.Pipeline {
+func (d dynamicFilter) FilterQuery(ctx context.Context) mongo.Pipeline {
 	return d.pipeline
 }
 
-func (d dynamicFilter) Sort() bson.D {
+func (d dynamicFilter) Sort(ctx context.Context) bson.D {
 	return d.sort
 }
 

wmo/queryList.go

@@ -25,8 +25,8 @@ func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int,
 	pd2 := ct.SortASC
 
 	if filter != nil {
-		pipeline = filter.FilterQuery()
-		pf1, pd1, pf2, pd2 = filter.Pagination()
+		pipeline = filter.FilterQuery(ctx)
+		pf1, pd1, pf2, pd2 = filter.Pagination(ctx)
 	}
 
 	sortPrimary := pf1
@@ -109,7 +109,7 @@ func (c *Coll[TData]) Count(ctx context.Context, filter ct.RawFilter) (int64, er
 		Count int64 `bson:"c"`
 	}
 
-	pipeline := filter.FilterQuery()
+	pipeline := filter.FilterQuery(ctx)
 
 	pipeline = append(pipeline, bson.D{{Key: "$count", Value: "c"}})
 
@@ -152,7 +152,7 @@ func (c *Coll[TData]) ListAllIDs(ctx context.Context, filter ct.RawFilter) ([]st
 	pipelineFilter := mongo.Pipeline{}
 
 	if filter != nil {
-		pipelineFilter = filter.FilterQuery()
+		pipelineFilter = filter.FilterQuery(ctx)
 	}
 
 	extrModPipelineResolved := mongo.Pipeline{}

wmo/queryPaginate.go

@@ -23,8 +23,8 @@ func (c *Coll[TData]) Paginate(ctx context.Context, filter pag.MongoFilter, page
 	sort := bson.D{}
 
 	if filter != nil {
-		pipelineFilter = filter.FilterQuery()
-		sort = filter.Sort()
+		pipelineFilter = filter.FilterQuery(ctx)
+		sort = filter.Sort(ctx)
 	}
 
 	if len(sort) != 0 {