fix: #6911, email throttling options set

NodeBB · Mar 25, 2019 · 63e16ec · 63e16ec
1 parent 33a1bf6
commit 63e16ec
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/install/data/defaults.json b/install/data/defaults.json
@@ -99,6 +99,8 @@
     "maximumInvites": 0,
     "username:disableEdit": 0,
     "email:disableEdit": 0,
+    "email:sendmail:rateLimit": 2,
+    "email:sendmail:rateDelta": 1000,
     "hideFullname": 0,
     "allowGuestHandles": 0,
     "disableRecentCategoryFilter": 0,

diff --git a/public/language/en-GB/admin/settings/email.json b/public/language/en-GB/admin/settings/email.json
@@ -4,6 +4,9 @@
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
+	"sendmail-rate-limit": "Send <em>X</em> emails...",
+	"sendmail-rate-delta": "... every <em>X</em> milliseconds",
+	"sendmail-rate-help": "Instructs the NodeBB mailer to limit the number of messages sent at once in order to not overwhelm email receiving services. These options do not apply if SMTP Transport is enabled (below).",
 
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Use an external email server to send emails",

diff --git a/src/emailer.js b/src/emailer.js
@@ -27,7 +27,8 @@ Emailer.transports = {
 		sendmail: true,
 		newline: 'unix',
 		pool: true,
-		rateLimit: 2,
+		rateLimit: meta.config['email:sendmail:rateLimit'],
+		rateDelta: meta.config['email:sendmail:rateDelta'],
 	}),
 	smtp: undefined,
 };

diff --git a/src/views/admin/settings/email.tpl b/src/views/admin/settings/email.tpl
@@ -18,6 +18,19 @@
 				</p>
 				<input type="text" class="form-control input-lg" id="email:from_name" data-field="email:from_name" placeholder="NodeBB" /><br />
 			</div>
+			<div class="row">
+				<div class="form-group col-sm-6">
+					<label for="email:sendmail:rateLimit">[[admin/settings/email:sendmail-rate-limit]]</label>
+					<input type="number" data-field="email:sendmail:rateLimit" id="email:sendmail:rateLimit" class="form-control" placeholder="2" />
+				</div>
+				<div class="form-group col-sm-6">
+					<label for="email:sendmail:rateDelta">[[admin/settings/email:sendmail-rate-delta]]</label>
+					<input type="number" data-field="email:sendmail:rateDelta" id="email:sendmail:rateDelta" class="form-control" placeholder="1000" />
+				</div>
+				<p class="col-xs-12 help-block">
+					[[admin/settings/email:sendmail-rate-help]]
+				</p>
+			</div>
 		</form>
 	</div>
 </div>