mastodon/relay
1
0
Fork 0
mirror of https://git.ptzo.gdn/feditools/relay.git synced 2024-09-21 14:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

tighter limits (#172)

Browse Source 
Reviewed-on: https://git.ptzo.gdn/feditools/relay/pulls/172
Co-authored-by: Tyr Mactire <tyr@pettingzoo.co>
Co-committed-by: Tyr Mactire <tyr@pettingzoo.co>
This commit is contained in:
Tyr Mactire 2022-12-06 06:15:44 +00:00 committed by PettingZoo Gitea
parent 54fa199245
commit 1e1d15b8db
No known key found for this signature in database
GPG Key ID: 39788A4390A1372F
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/logic/logic1/maintenance.go
View File

@ -15,13 +15,13 @@ func (l *Logic) MaintDeliveryErrorTimeout(ctx context.Context, jid string) error
today := time.Date(time.Now().UTC().Year(), time.Now().UTC().Month(), time.Now().UTC().Day(), 0, 0, 0, 0, time.UTC) today := time.Date(time.Now().UTC().Year(), time.Now().UTC().Month(), time.Now().UTC().Day(), 0, 0, 0, 0, time.UTC)
deliverErrors, err := l.MetricsGetAllDeliverErrorWeek(ctx, 8) deliverErrors, err := l.MetricsGetAllDeliverErrorWeek(ctx, 2)
if err != nil { if err != nil {
log.Errorf("metrics get errors: %s", err.Error()) log.Errorf("metrics get errors: %s", err.Error())
return nil // always return nil, this job is scheduled return nil // always return nil, this job is scheduled
} }
deliverSuccesses, err := l.MetricsGetAllDeliverSuccessWeek(ctx, 8) deliverSuccesses, err := l.MetricsGetAllDeliverSuccessWeek(ctx, 2)
if err != nil { if err != nil {
log.Errorf("metrics get successes: %s", err.Error()) log.Errorf("metrics get successes: %s", err.Error())

3
internal/runner/faktory/activity.go
View File

@ -12,8 +12,11 @@ import (
) )
func (r *Runner) EnqueueDeliverActivity(_ context.Context, instanceID int64, activity fedihelper.Activity) error { func (r *Runner) EnqueueDeliverActivity(_ context.Context, instanceID int64, activity fedihelper.Activity) error {
retry := 8
job := faktory.NewJob(JobDeliverActivity, strconv.FormatInt(instanceID, 10), activity) job := faktory.NewJob(JobDeliverActivity, strconv.FormatInt(instanceID, 10), activity)
job.Queue = QueueDelivery job.Queue = QueueDelivery
job.Retry = &retry
return r.manager.Pool.With(func(conn *faktory.Client) error { return r.manager.Pool.With(func(conn *faktory.Client) error {
return conn.Push(job) return conn.Push(job)