From 19c3121e7752ce766dd1ebb9ff5d1741421d7a84 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 4 Dec 2025 16:32:26 +0200 Subject: [PATCH] login*: apply zap log level shifting --- pkg/connector/client.go | 26 ++++++++++++++------------ pkg/connector/loginphone.go | 2 +- pkg/connector/loginqr.go | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pkg/connector/client.go b/pkg/connector/client.go index 9c834614..75a452a5 100644 --- a/pkg/connector/client.go +++ b/pkg/connector/client.go @@ -149,6 +149,19 @@ func (tg *TelegramConnector) deviceConfig() telegram.DeviceConfig { } } +var zapLevelMap = map[zapcore.Level]zerolog.Level{ + // shifted + zapcore.DebugLevel: zerolog.TraceLevel, + zapcore.InfoLevel: zerolog.DebugLevel, + + // direct mapping + zapcore.WarnLevel: zerolog.WarnLevel, + zapcore.ErrorLevel: zerolog.ErrorLevel, + zapcore.DPanicLevel: zerolog.PanicLevel, + zapcore.PanicLevel: zerolog.PanicLevel, + zapcore.FatalLevel: zerolog.FatalLevel, +} + func NewTelegramClient(ctx context.Context, tc *TelegramConnector, login *bridgev2.UserLogin) (*TelegramClient, error) { telegramUserID, err := ids.ParseUserLoginID(login.ID) if err != nil { @@ -160,18 +173,7 @@ func NewTelegramClient(ctx context.Context, tc *TelegramConnector, login *bridge Str("user_login_id", string(login.ID)). Logger() - zaplog := zap.New(zerozap.NewWithLevels(log, map[zapcore.Level]zerolog.Level{ - // shifted - zapcore.DebugLevel: zerolog.TraceLevel, - zapcore.InfoLevel: zerolog.DebugLevel, - - // direct mapping - zapcore.WarnLevel: zerolog.WarnLevel, - zapcore.ErrorLevel: zerolog.ErrorLevel, - zapcore.DPanicLevel: zerolog.PanicLevel, - zapcore.PanicLevel: zerolog.PanicLevel, - zapcore.FatalLevel: zerolog.FatalLevel, - })) + zaplog := zap.New(zerozap.NewWithLevels(log, zapLevelMap)) client := TelegramClient{ ScopedStore: tc.Store.GetScopedStore(telegramUserID), diff --git a/pkg/connector/loginphone.go b/pkg/connector/loginphone.go index e3f29bee..bad03b8a 100644 --- a/pkg/connector/loginphone.go +++ b/pkg/connector/loginphone.go @@ -84,7 +84,7 @@ func (p *PhoneLogin) SubmitUserInput(ctx context.Context, input map[string]strin p.phone = phone p.authClient = telegram.NewClient(p.main.Config.APIID, p.main.Config.APIHash, telegram.Options{ CustomSessionStorage: &p.authData, - Logger: zap.New(zerozap.New(zerolog.Ctx(ctx).With().Str("component", "telegram_phone_login_client").Logger())), + Logger: zap.New(zerozap.NewWithLevels(zerolog.Ctx(ctx).With().Str("component", "telegram_phone_login_client").Logger(), zapLevelMap)), Device: p.main.deviceConfig(), }) diff --git a/pkg/connector/loginqr.go b/pkg/connector/loginqr.go index 6b3e1e06..a89db643 100644 --- a/pkg/connector/loginqr.go +++ b/pkg/connector/loginqr.go @@ -76,7 +76,7 @@ func (q *QRLogin) Start(ctx context.Context) (*bridgev2.LoginStep, error) { loggedIn <- struct{}{} return nil }) - zaplog := zap.New(zerozap.New(log)) + zaplog := zap.New(zerozap.NewWithLevels(log, zapLevelMap)) updateManager := updates.New(updates.Config{ Handler: dispatcher, Logger: zaplog.Named("login_update_manager"),