mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-04 21:47:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

target/queue: Increase the amount of tries, decrease delay scale factor

Browse source 
This makes server more aggressive in retrying delivery. The total
attempts time is approximately the same (around 5 days).

Notably, the increased amount of attempts is needed to handle large
recipient lists where the remote server sometimes rejects subset of them
with "Too Many Recipients" code.

See #149.
This commit is contained in:
fox.cpp 2020-02-16 19:56:57 +03:00
parent 8635a11293
commit f559143728
No known key found for this signature in database
GPG key ID: E76D97CCEDE90B6C
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
docs/man/maddy-targets.5.scd
View file

@ -62,11 +62,16 @@ Start up to _integer_ goroutines for message processing. Basically, this option
limits amount of messages tried to be delivered concurrently.
*Syntax*: max_tries _integer_ ++
*Default*: 4
*Default*: 20
Attempt delivery up to _integer_ times. Note that no more attempts will be done
is permanent error occured during previous attempt.
Delay before the next attempt will be increased exponentally using the
following formula: 15mins * 1.2 ^ (n - 1) where n is the attempt number.
This gives you approximately the following sequence of delays:
18mins, 21mins, 25mins, 31mins, 37mins, 44mins, 53mins, 64mins, ...
*Syntax*: bounce { ... } ++
*Default*: not specified

4
internal/target/queue/queue.go
View file

@ -174,7 +174,7 @@ func NewQueue(_, instName string, _, inlineArgs []string) (module.Module, error)
q := &Queue{
name: instName,
initialRetryTime: 15 * time.Minute,
retryTimeScale: 2,
retryTimeScale: 0.25,
postInitDelay: 10 * time.Second,
Log: log.Logger{Name: "queue"},
}
@ -192,7 +192,7 @@ func NewQueue(_, instName string, _, inlineArgs []string) (module.Module, error)
func (q *Queue) Init(cfg *config.Map) error {
var maxParallelism int
cfg.Bool("debug", true, false, &q.Log.Debug)
cfg.Int("max_tries", false, false, 8, &q.maxTries)
cfg.Int("max_tries", false, false, 20, &q.maxTries)
cfg.Int("max_parallelism", false, false, 16, &maxParallelism)
cfg.String("location", false, false, q.location, &q.location)
cfg.Custom("target", false, true, nil, modconfig.DeliveryDirective, &q.Target)