jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394380 )
Change subject: Disable statsd collection instead of replacing statsd
......................................................................
Disable statsd collection instead of replacing statsd
Since statsd service is initialized very early, we can't
overwrite it anyway.
Bug: T181716
Change-Id: I9a2177486dee1f8329dc9af553e434d91bd397cd
---
M includes/Maintenance/Maintenance.php
1 file changed, 3 insertions(+), 10 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Maintenance/Maintenance.php
b/includes/Maintenance/Maintenance.php
index 894049a..c9d8dbd 100644
--- a/includes/Maintenance/Maintenance.php
+++ b/includes/Maintenance/Maintenance.php
@@ -6,7 +6,6 @@
use CirrusSearch\SearchConfig;
use MediaWiki\MediaWikiServices;
use CirrusSearch\UserTesting;
-use MediaWiki\Services\CannotReplaceActiveServiceException;
/**
* Cirrus helpful extensions to Maintenance.
@@ -197,21 +196,15 @@
global $wgPoolCounterConf, $wgCirrusSearchLogElasticRequests;
// Make sure we don't flood the pool counter
- $wgPoolCounterConf = [];
unset( $wgPoolCounterConf['CirrusSearch-Search'] );
// Don't skew the dashboards by logging these requests to
// the global request log.
$wgCirrusSearchLogElasticRequests = false;
// Disable statsd data collection.
- try {
- $services = \MediaWiki\MediaWikiServices::getInstance();
- $services->redefineService( "StatsdDataFactory",
- function ( MediaWikiServices $services ) {
- return new \NullStatsdDataFactory();
- } );
- } catch ( CannotReplaceActiveServiceException $e ) {
- // ignore it, failing to disable stats is tolerable
+ $stats =
MediaWikiServices::getInstance()->getStatsdDataFactory();
+ if ( $stats ) {
+ $stats->setEnabled( false );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/394380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a2177486dee1f8329dc9af553e434d91bd397cd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <[email protected]>
Gerrit-Reviewer: Cindy-the-browser-test-bot <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Tjones <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
