feat(app): pass relay.rate_per_second to the queue worker

- one line of wiring, a commented example in parsimony.example.yaml
- tests: with a rate of 20/s eight deliveries to a sink take at least 350 ms, without a rate they are not paced
This commit is contained in:
tgiachi 2026-11-10 12:37:15 +01:00
commit adeae3f451
3 changed files with 51 additions and 0 deletions

View file

@ -229,6 +229,7 @@ func Start(cfg config.Config, apiToken string) (*App, error) {
Username: cfg.Relay.Username, Password: relayPassword, Helo: heloName(cfg.Relay.Helo),
},
Concurrency: cfg.Relay.Concurrency,
Rate: float64(cfg.Relay.RatePerSecond),
Sign: sign,
}
rt.OnEnqueue = worker.Wake

View file

@ -1310,3 +1310,52 @@ func TestHTTPServersCarryTheTimeouts(t *testing.T) {
}
}
}
func TestTheRelayRateReachesTheWorker(t *testing.T) {
relayAddr, relay := startSink(t)
cfg := testConfig(t, relayAddr)
cfg.Relay.RatePerSecond = 20 // 50 ms between two sends
a, err := Start(cfg, "tok")
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() { a.Close() })
call(t, a, "POST", "/api/v1/lists", `{"name":"dev","domain":"example.org"}`, "tok")
const members = 8
for i := 0; i < members; i++ {
call(t, a, "POST", "/api/v1/lists/1/members", fmt.Sprintf(`{"address":"m%d@example.com"}`, i), "tok")
}
start := time.Now()
msg := "From: M0 <m0@example.com>\r\nSubject: paced\r\nMessage-ID: <p1@x>\r\n\r\nbody\r\n"
if err := lmtpSend(t, a.LMTPAddr, "m0@example.com", "dev@example.org", msg); err != nil {
t.Fatal(err)
}
relay.waitCount(t, members)
// 8 sends started 50 ms apart: the last one cannot start before 350 ms.
if took := time.Since(start); took < 330*time.Millisecond {
t.Fatalf("%d deliveries took %v: the rate did not reach the worker", members, took)
}
}
func TestWithoutARateTheRelayIsNotPaced(t *testing.T) {
relayAddr, relay := startSink(t)
a, err := Start(testConfig(t, relayAddr), "tok")
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() { a.Close() })
call(t, a, "POST", "/api/v1/lists", `{"name":"dev","domain":"example.org"}`, "tok")
const members = 8
for i := 0; i < members; i++ {
call(t, a, "POST", "/api/v1/lists/1/members", fmt.Sprintf(`{"address":"m%d@example.com"}`, i), "tok")
}
start := time.Now()
msg := "From: M0 <m0@example.com>\r\nSubject: free\r\nMessage-ID: <p2@x>\r\n\r\nbody\r\n"
if err := lmtpSend(t, a.LMTPAddr, "m0@example.com", "dev@example.org", msg); err != nil {
t.Fatal(err)
}
relay.waitCount(t, members)
if took := time.Since(start); took > 3*time.Second {
t.Fatalf("%d deliveries took %v without a rate", members, took)
}
}

View file

@ -12,6 +12,7 @@ relay:
# username: user
# password_file: /run/secrets/relay-password
concurrency: 4 # simultaneous deliveries
# rate_per_second: 14 # at most this many sends started per second, for relays that throttle (Amazon SES); 0 = unlimited
web:
listen: 0.0.0.0:8081 # public archive and unsubscribe pages; "" disables them
api: