jenkins-bot has submitted this change and it was merged.
Change subject: Remove EchoBundleEmailInterval
......................................................................
Remove EchoBundleEmailInterval
Follow up to I95dc3d70c82c19d89b7a32be0c36294350d5c30d
Remove config related to email bundling.
Bug: T135446
Change-Id: I2967a8cd8e3fe439125fd8dbebde990a561528df
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 15 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ad7a38f..a0a0316 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2705,10 +2705,6 @@
if ( $wmgUseEcho ) {
require_once( "$IP/extensions/Echo/Echo.php" );
- if ( $wmgUseClusterJobqueue ) {
- $wgJobTypeConf['MWEchoNotificationEmailBundleJob'] = [
'checkDelay' => true ] + $wgJobTypeConf['default'];
- }
-
// Eventlogging for Schema:EchoMail
$wgEchoConfig['eventlogging']['EchoMail']['enabled'] = true;
// Eventlogging for Schema:EchoInteraction
@@ -2716,9 +2712,6 @@
$wgEchoEnableEmailBatch = $wmgEchoEnableEmailBatch;
$wgEchoEmailFooterAddress = $wmgEchoEmailFooterAddress;
- if ( $wmgUseClusterJobqueue ) {
- $wgEchoBundleEmailInterval = $wmgEchoBundleEmailInterval;
- }
$wgEchoNotificationIcons['site']['url'] =
$wmgEchoSiteNotificationIconUrl;
# Outgoing from and reply to address for Echo notifications extension
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index abb87ef..e076b29 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15623,14 +15623,6 @@
'enwiki' => '[email protected]',
],
-// The time interval in seconds between each bundle-able email notification
-// Set to 0 to disable email bundling
-'wmgEchoBundleEmailInterval' => [
- 'default' => 14400,
- 'test2wiki' => 300,
- 'officewiki' => 0,
-],
-
// Use extension1 db for all wikis
'wmgEchoCluster' => [
'default' => 'extension1',
--
To view, visit https://gerrit.wikimedia.org/r/289395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2967a8cd8e3fe439125fd8dbebde990a561528df
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Sbisson <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Dereckson <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
