Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334389 )
Change subject: Enable eventbus RCFeed in production and deployment-prep beta
......................................................................
Enable eventbus RCFeed in production and deployment-prep beta
This can be merged after 1.29.0-wmf.9 is fully deployed in production,
which should be later today.
Bug: T152030
Change-Id: I21fd17467796635ec61e93c5c202fe5d7358e65b
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
2 files changed, 13 insertions(+), 16 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 11cb6c1..c6f2507 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -25,21 +25,6 @@
'uri' =>
"redis://deployment-stream.eqiad.wmflabs:6379/rc.$wgDBname",
];
-
-if ( $wmgUseEventBus ) {
- // Configure RecentChange to send recentchange events to EventBus
service.
- // Add a mapping from eventbus:// RCFeed URIs to the
EventBusRCFeedEngine.
- $wgRCEngines['eventbus'] = 'EventBusRCFeedEngine';
- $wgRCFeeds['eventbus'] = [
- 'formatter' => 'EventBusRCFeedFormatter',
- // Replace 'http://' in eventbus service endpoint with
'eventbus://'.
- // This is necessary so that the URI can properly map to an
entry in
- // $wgRCEngines. This hack can be removed after
- // https://gerrit.wikimedia.org/r/#/c/330833/ is merged.
- 'uri' => str_replace( 'http://', 'eventbus://',
$wgEventServiceUrl )
- ];
-}
-
$wgProfiler['udphost'] = 'labmon1001.eqiad.wmnet';
$wgDebugTimestamps = true;
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 85af43a..25ec885 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -849,7 +849,7 @@
//for avconv / ffmpeg2theora
$wgTranscodeBackgroundMemoryLimit = 4 * 1024 * 1024; // 4GB
$wgFFmpegThreads = 2;
-
+
// ffmpeg tends to use about 175% CPU when threaded, so hits
// the default 8-hour ulimit in 4-6 hours. This tends to cut
// off very large files at very high resolution just before
@@ -3383,6 +3383,18 @@
if ( $wmgUseEventBus ) {
wfLoadExtension( 'EventBus' );
$wgEventServiceUrl = "{$wmfLocalServices['eventbus']}/v1/events";
+
+ // Configure RecentChange to send recentchange events to EventBus
service.
+ // Add a mapping from eventbus:// RCFeed URIs to the
EventBusRCFeedEngine.
+ $wgRCEngines['eventbus'] = 'EventBusRCFeedEngine';
+ $wgRCFeeds['eventbus'] = [
+ 'formatter' => 'EventBusRCFeedFormatter',
+ // Replace 'http://' in eventbus service endpoint with
'eventbus://'.
+ // This is necessary so that the URI can properly map to an
entry in
+ // $wgRCEngines. This hack can be removed after
+ // https://gerrit.wikimedia.org/r/#/c/330833/ is merged.
+ 'uri' => str_replace( 'http://', 'eventbus://',
$wgEventServiceUrl )
+ ];
}
if ( $wmgUseCapiunto ) {
--
To view, visit https://gerrit.wikimedia.org/r/334389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21fd17467796635ec61e93c5c202fe5d7358e65b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
