iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

login: fix context used for starting takeout

Browse Source
This commit is contained in:
Tulir Asokan
2026-02-11 13:25:32 +02:00
parent 4793b01a29
commit a59c755dd8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/login.go
+10 -4
View File
@@ -232,12 +232,13 @@ func (bl *baseLogin) finalizeLogin(
ul.Client.Connect(ul.Log.WithContext(bl.main.Bridge.BackgroundCtx)) ul.Client.Connect(ul.Log.WithContext(bl.main.Bridge.BackgroundCtx))
client := ul.Client.(*TelegramClient) client := ul.Client.(*TelegramClient)
bgCtx := ul.Log.WithContext(bl.main.Bridge.BackgroundCtx)
go func() { go func() {
if metadata.IsBot { if metadata.IsBot {
return return
} }
log := ul.Log.With().Str("action", "post-login sync").Logger() log := ul.Log.With().Str("action", "post-login sync").Logger()
err := client.clientInitialized.Wait(ctx) err := client.clientInitialized.Wait(bgCtx)
if err != nil { if err != nil {
log.Err(err).Msg("Failed to wait for client init to sync chats after login") log.Err(err).Msg("Failed to wait for client init to sync chats after login")
} else if err = client.SyncChats(log.WithContext(client.clientCtx)); err != nil { } else if err = client.SyncChats(log.WithContext(client.clientCtx)); err != nil {
@@ -252,13 +253,18 @@ func (bl *baseLogin) finalizeLogin(
log := ul.Log.With().Str("component", "post-login takeout").Logger() log := ul.Log.With().Str("component", "post-login takeout").Logger()
client.takeoutLock.Lock() client.takeoutLock.Lock()
defer client.takeoutLock.Unlock() defer client.takeoutLock.Unlock()
err := client.clientInitialized.Wait(ctx) err := client.clientInitialized.Wait(bgCtx)
if err != nil { if err != nil {
log.Err(err).Msg("Failed to wait for client init to start takeout") log.Err(err).Msg("Failed to wait for client init to start takeout")
} else if _, err = client.getTakeoutID(ctx); err != nil { } else if _, err = client.getTakeoutID(bgCtx); err != nil {
log.Err(err).Msg("Failed to get takeout") log.Err(err).Msg("Failed to get takeout")
} else if client.stopTakeoutTimer == nil { } else if client.stopTakeoutTimer == nil {
client.stopTakeoutTimer = time.AfterFunc(max(time.Hour, time.Duration(client.main.Bridge.Config.Backfill.Queue.BatchDelay*2)), sync.OnceFunc(func() { client.stopTakeout(ctx) })) client.stopTakeoutTimer = time.AfterFunc(max(time.Hour, time.Duration(client.main.Bridge.Config.Backfill.Queue.BatchDelay*2)), sync.OnceFunc(func() {
err := client.stopTakeout(bgCtx)
if err != nil {
log.Err(err).Msg("Error stopping takeout in timer started after login")
}
}))
} else { } else {
client.stopTakeoutTimer.Reset(max(time.Hour, time.Duration(client.main.Bridge.Config.Backfill.Queue.BatchDelay*2))) client.stopTakeoutTimer.Reset(max(time.Hour, time.Duration(client.main.Bridge.Config.Backfill.Queue.BatchDelay*2)))
} }