Revision: 155
http://svn.sourceforge.net/nmailserver/?rev=155&view=rev
Author: tmyroadctfig
Date: 2007-02-23 19:55:08 -0800 (Fri, 23 Feb 2007)
Log Message:
-----------
Changed the way the next delivery attempt is calculated. Scaled back the default number of failed attempts before a warning is sent. Changed the default maximum time messages will stay in the spool. (Fixes bug #1667639)
Modified Paths:
--------------
NMail/trunk/NMail.MessageRouter/Configuration/MessageRouterConfiguration.cs
NMail/trunk/NMail.MessageRouter/MessageRouter.cs
Modified: NMail/trunk/NMail.MessageRouter/Configuration/MessageRouterConfiguration.cs
===================================================================
--- NMail/trunk/NMail.MessageRouter/Configuration/MessageRouterConfiguration.cs 2007-02-18 02:43:40 UTC (rev 154)
+++ NMail/trunk/NMail.MessageRouter/Configuration/MessageRouterConfiguration.cs 2007-02-24 03:55:08 UTC (rev 155)
@@ -74,7 +74,7 @@
/// <summary>
/// The maximum number of delivery attempts before a message is bounced.
/// </summary>
- [ConfigurationProperty("MaxDeliveryAttempts", DefaultValue = 20)]
+ [ConfigurationProperty("MaxDeliveryAttempts", DefaultValue = 15)]
[IntegerValidator(MinValue = 1, MaxValue = Int32.MaxValue)]
public int MaximumDeliveryAttempts {
get {
@@ -88,7 +88,7 @@
/// <summary>
/// The number of delivery attempts before a message warning message is sent.
/// </summary>
- [ConfigurationProperty("WarnDeliveryAttempts", DefaultValue=10)]
+ [ConfigurationProperty("WarnDeliveryAttempts", DefaultValue=5)]
[IntegerValidator(MinValue=1, MaxValue=Int32.MaxValue)]
public int WarningDeliveryAttempts {
get {
Modified: NMail/trunk/NMail.MessageRouter/MessageRouter.cs
===================================================================
--- NMail/trunk/NMail.MessageRouter/MessageRouter.cs 2007-02-18 02:43:40 UTC (rev 154)
+++ NMail/trunk/NMail.MessageRouter/MessageRouter.cs 2007-02-24 03:55:08 UTC (rev 155)
@@ -237,7 +237,8 @@
/// <param name="deliveryAttempts">The number of delivery attempts so far.</param>
/// <returns>The number of hours to wait.</returns>
public double GetDeliveryDelay(int deliveryAttempts) {
- return ((double)(deliveryAttempts * deliveryAttempts)) / 2.0;
+ // Try again quickly (in 15 minutes), then back off per delivery attempt
+ return 0.25 + (deliveryAttempts - 1) * 0.5;
}
/// <summary>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|