tezlm/mautrix-discord
1
0
Fork 0
forked from mirror/mautrix-discord
Code Pull requests Activity

Sleep between backfills

Browse source
This commit is contained in:
Joonas Myhrberg 2023-08-03 11:58:57 +03:00
parent e3340d61ec
commit 1b7f2f61ea
4 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
backfill.go
View file

@ -5,8 +5,10 @@ import (
"crypto/sha256"
"encoding/base64"
"fmt"
"math/rand"
"sort"
"sync"
"time"
"github.com/bwmarrin/discordgo"
"github.com/rs/zerolog"
@ -125,6 +127,13 @@ func (portal *Portal) collectBackfillMessages(log zerolog.Logger, source *User,
protoChannelID = thread.ID
}
for {
sleepMin := portal.bridge.Config.Bridge.Backfill.SleepMin
sleepMax := portal.bridge.Config.Bridge.Backfill.SleepMax
if sleepMin > 0 && sleepMax > 0 {
sleep := time.Duration(sleepMin+(sleepMax-sleepMin)*rand.Float64()) * time.Second
log.Debug().Dur("sleep", sleep).Msg("Sleeping before fetching more messages")
time.Sleep(sleep)
}
log.Debug().Str("before_id", before).Msg("Fetching messages for backfill")
newMessages, err := source.Session.ChannelMessages(protoChannelID, messageFetchChunkSize, before, "", "")
if err != nil {
@ -188,6 +197,13 @@ func (portal *Portal) backfillUnlimitedMissed(log zerolog.Logger, source *User,
protoChannelID = thread.ID
}
for {
sleepMin := portal.bridge.Config.Bridge.Backfill.SleepMin
sleepMax := portal.bridge.Config.Bridge.Backfill.SleepMax
if sleepMin > 0 && sleepMax > 0 {
sleep := time.Duration(sleepMin+(sleepMax-sleepMin)*rand.Float64()) * time.Second
log.Debug().Dur("sleep", sleep).Msg("Sleeping before fetching more messages")
time.Sleep(sleep)
}
log.Debug().Str("after_id", after).Msg("Fetching chunk of messages to backfill")
messages, err := source.Session.ChannelMessages(protoChannelID, messageFetchChunkSize, "", after, "")
if err != nil {

2
config/bridge.go
View file

@ -75,6 +75,8 @@ type BridgeConfig struct {
ManagementRoomText bridgeconfig.ManagementRoomTexts `yaml:"management_room_text"`
Backfill struct {
SleepMin float64 `yaml:"sleep_min"`
SleepMax float64 `yaml:"sleep_max"`
Limits struct {
Initial BackfillLimitPart `yaml:"initial"`
Missed BackfillLimitPart `yaml:"missed"`

2
config/upgrade.go
View file

@ -77,6 +77,8 @@ func DoUpgrade(helper *up.Helper) {
helper.Copy(up.Str, "bridge", "management_room_text", "welcome_unconnected")
helper.Copy(up.Str|up.Null, "bridge", "management_room_text", "additional_help")
helper.Copy(up.Bool, "bridge", "backfill", "enabled")
helper.Copy(up.Float, "bridge", "backfill", "sleep_min")
helper.Copy(up.Float, "bridge", "backfill", "sleep_max")
helper.Copy(up.Int, "bridge", "backfill", "forward_limits", "initial", "dm")
helper.Copy(up.Int, "bridge", "backfill", "forward_limits", "initial", "channel")
helper.Copy(up.Int, "bridge", "backfill", "forward_limits", "initial", "thread")

2
example-config.yaml
View file

@ -225,6 +225,8 @@ bridge:
# Settings for backfilling messages.
backfill:
sleep_min: 0.5
sleep_max: 6.0
# Limits for forward backfilling.
forward_limits:
# Initial backfill (when creating portal). 0 means backfill is disabled.