* serv_smtp.c: instead of doubling delivery retry times unbounded, set a

[citadel.git] / citadel / sysconfig.h

diff --git a/citadel/sysconfig.h b/citadel/sysconfig.h
index 745f9ca7ef8e9e4214edc0cf649104fbb5d85276..312b1f93abce6ab1ae520c8e6b3890acf2203960 100644 (file)
--- a/citadel/sysconfig.h
+++ b/citadel/sysconfig.h
@@ -79,10 +79,17 @@
 #define SIZ            4096
 
 /*
- * SMTP delivery retry and give-up times
+ * SMTP delivery retry rules (all values are in seconds)
+ *
+ * If delivery of a message via SMTP is unsuccessful, Citadel will try again
+ * after SMTP_RETRY_INTERVAL seconds.  This interval will double after each
+ * unsuccessful delivery, up to a maximum of SMTP_RETRY_MAX seconds.  If no
+ * successful delivery has been accomplished after SMTP_GIVE_UP seconds, the
+ * message will be returned to its sender.
  */
-#define        SMTP_RETRY_INTERVAL     900     /* retry sends every 15 minutes */
-#define SMTP_GIVE_UP           432000  /* give up after 5 days */
+#define        SMTP_RETRY_INTERVAL     900     /* 15 minutes */
+#define SMTP_RETRY_MAX         43200   /* 12 hours */
+#define SMTP_GIVE_UP           432000  /* 5 days */
 
 /*
  * How often to run the networker