Skip to content

Commit 99bded8

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: improve documentation for mailer failover and round-robin transports
2 parents e082c3a + e73f978 commit 99bded8

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

mailer.rst

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ A failover transport is configured with two or more transports and the
210210
211211
MAILER_DSN="failover(postmark+api://ID@default sendgrid+smtp://KEY@default)"
212212
213-
The mailer will start using the first transport. If the sending fails, the
214-
mailer won't retry it with the other transports, but it will switch to the next
215-
transport automatically for the following deliveries.
213+
The failover-transport starts using the first transport and if it fails, it
214+
will retry the same delivery with the next transports until one of them succeeds
215+
(or until all of them fail).
216216

217217
Load Balancing
218218
~~~~~~~~~~~~~~
@@ -227,9 +227,12 @@ A round-robin transport is configured with two or more transports and the
227227
228228
MAILER_DSN="roundrobin(postmark+api://ID@default sendgrid+smtp://KEY@default)"
229229
230-
The mailer will start using a randomly selected transport and if it fails, it
231-
will retry the same delivery with the next transports until one of them succeeds
232-
(or until all of them fail).
230+
The round-robin transport starts with a *randomly* selected transport and
231+
then switches to the next available transport for each subsequent email.
232+
233+
As with the failover transport, round-robin retries deliveries until
234+
a transport succeeds (or all fail). In contrast to the failover transport,
235+
it *spreads* the load across all its transports.
233236

234237
.. versionadded:: 5.1
235238

0 commit comments

Comments
 (0)