Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
kooksee committed Feb 2, 2024
1 parent de714e2 commit 07bcefd
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
5 changes: 3 additions & 2 deletions generic/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ func IsNil(err interface{}) bool {
return v.IsZero()
}

func Init[T any](fn func() T) T {
return fn()
func Init(fn func()) error {
fn()
return nil
}
17 changes: 11 additions & 6 deletions log/global.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ import (
"time"

"github.com/rs/zerolog"
llog "github.com/rs/zerolog/log"

"github.com/pubgo/funk/assert"
"github.com/pubgo/funk/generic"
)

var (
_ = func() interface{} {
_ = generic.Init(func() {
zerolog.SetGlobalLevel(zerolog.DebugLevel)
return nil
}()
})

// stdZerolog default zerolog for debug
stdZerolog = generic.Ptr(
// stdZeroLog default zerolog for debug
stdZeroLog = generic.Ptr(
zerolog.New(os.Stderr).Level(zerolog.DebugLevel).
With().Timestamp().Caller().Logger().
Output(zerolog.NewConsoleWriter(func(w *zerolog.ConsoleWriter) {
Expand All @@ -28,6 +28,10 @@ var (
})).Hook(new(hookImpl)),
)

_ = generic.Init(func() {
llog.Logger = *stdZeroLog
})

// stdLog is the global logger.
stdLog = New(nil)
)
Expand All @@ -40,7 +44,8 @@ func GetLogger(name string) Logger {
// SetLogger set global log
func SetLogger(log *zerolog.Logger) {
assert.If(log == nil, "[log] should not be nil")
stdZerolog = log
stdZeroLog = log
llog.Logger = *log
}

// Err starts a new message with error level with err as a field if not nil or
Expand Down
2 changes: 1 addition & 1 deletion log/impl.log.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func (l *loggerImpl) getLog() *zerolog.Logger {
if l.log != nil {
return l.log
}
return stdZerolog
return stdZeroLog
}

func (l *loggerImpl) newEvent(ctxL []context.Context, e *zerolog.Event) *zerolog.Event {
Expand Down

0 comments on commit 07bcefd

Please sign in to comment.