login*: apply zap log level shifting
This commit is contained in:
+14
-12
@@ -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),
|
||||
|
||||
@@ -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(),
|
||||
})
|
||||
|
||||
|
||||
@@ -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"),
|
||||
|
||||
Reference in New Issue
Block a user