Hoo man has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395055 )
Change subject: Only send statsd data for WAN cache in non-CLI mode
......................................................................
Only send statsd data for WAN cache in non-CLI mode
Bug: T181385
Change-Id: Ic51a084206cea93621393359ded4ff77beef5f13
---
M includes/objectcache/ObjectCache.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/55/395055/1
diff --git a/includes/objectcache/ObjectCache.php
b/includes/objectcache/ObjectCache.php
index 6d6d345..3257a11 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -332,6 +332,8 @@
* @throws UnexpectedValueException
*/
public static function newWANCacheFromParams( array $params ) {
+ global $wgCommandLineMode;
+
$services = MediaWikiServices::getInstance();
$erGroup = $services->getEventRelayerGroup();
@@ -340,12 +342,15 @@
$params['channels'][$action] = $channel;
}
$params['cache'] = self::newFromParams( $params['store'] );
- $params['stats'] = $services->getStatsdDataFactory();
if ( isset( $params['loggroup'] ) ) {
$params['logger'] = LoggerFactory::getInstance(
$params['loggroup'] );
} else {
$params['logger'] = LoggerFactory::getInstance(
'objectcache' );
}
+ if ( !$wgCommandLineMode ) {
+ // Send the statsd data post-send on HTTP requests;
avoid in CLI mode (T181385)
+ $params['stats'] = $services->getStatsdDataFactory();
+ }
$class = $params['class'];
return new $class( $params );
--
To view, visit https://gerrit.wikimedia.org/r/395055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic51a084206cea93621393359ded4ff77beef5f13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.10
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
