$profiler->logData();
$config = $context->getConfig();
- if ( $config->get( 'StatsdServer' ) ) {
+ $stats = MediaWikiServices::getInstance()->getStatsdDataFactory();
+ if ( $config->get( 'StatsdServer' ) && $stats->hasData() ) {
try {
$statsdServer = explode( ':', $config->get( 'StatsdServer' ) );
$statsdHost = $statsdServer[0];
$statsdSender = new SocketSender( $statsdHost, $statsdPort );
$statsdClient = new SamplingStatsdClient( $statsdSender, true, false );
$statsdClient->setSamplingRates( $config->get( 'StatsdSamplingRates' ) );
- $statsdClient->send(
- MediaWikiServices::getInstance()->getStatsdDataFactory()->getBuffer()
- );
+ $statsdClient->send( $stats->getData() );
} catch ( Exception $ex ) {
MWExceptionHandler::logException( $ex );
}
}
/**
- * @deprecated since 1.30 Call makeKey on a ObjectCache instance
- *
* Make a cache key for the local wiki.
*
+ * @deprecated since 1.30 Call makeKey on a BagOStuff instance
* @param string $args,...
* @return string
*/
}
/**
- * @deprecated since 1.30 Call makeGlobalKey on a ObjectCache instance
- *
* Make a cache key with database-agnostic prefix.
*
* Doesn't have a wiki-specific namespace. Uses a generic 'global' prefix
* instead. Must have a prefix as otherwise keys that use a database name
* in the first segment will clash with wfMemcKey/wfForeignMemcKey.
*
+ * @deprecated since 1.30 Call makeGlobalKey on a BagOStuff instance
* @since 1.26
* @param string $args,...
* @return string
}
$cache = ObjectCache::getLocalServerInstance( 'hash' );
- $key = wfMemcKey( 'bad-image-list', ( $blacklist === null ) ? 'default' : md5( $blacklist ) );
+ $key = $cache->makeKey(
+ 'bad-image-list', ( $blacklist === null ) ? 'default' : md5( $blacklist )
+ );
$badImages = $cache->get( $key );
if ( $badImages === false ) { // cache miss