dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Selenium: selenium-daily NPM script"
[lhc/web/wiklou.git]
/
includes
/
ServiceWiring.php
diff --git
a/includes/ServiceWiring.php
b/includes/ServiceWiring.php
index
286dde1
..
99b2942
100644
(file)
--- a/
includes/ServiceWiring.php
+++ b/
includes/ServiceWiring.php
@@
-37,6
+37,7
@@
* MediaWiki code base.
*/
* MediaWiki code base.
*/
+use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
use MediaWiki\Auth\AuthManager;
use MediaWiki\Config\ConfigRepository;
use MediaWiki\Interwiki\ClassicInterwikiLookup;
use MediaWiki\Auth\AuthManager;
use MediaWiki\Config\ConfigRepository;
use MediaWiki\Interwiki\ClassicInterwikiLookup;
@@
-71,7
+72,7
@@
return [
'BlobStoreFactory' => function ( MediaWikiServices $services ) : BlobStoreFactory {
return new BlobStoreFactory(
'BlobStoreFactory' => function ( MediaWikiServices $services ) : BlobStoreFactory {
return new BlobStoreFactory(
- $services->getDBLoadBalancer(),
+ $services->getDBLoadBalancer
Factory
(),
$services->getMainWANObjectCache(),
$services->getMainConfig(),
$services->getContentLanguage()
$services->getMainWANObjectCache(),
$services->getMainConfig(),
$services->getContentLanguage()
@@
-400,11
+401,12
@@
return [
},
'PerDbNameStatsdDataFactory' =>
},
'PerDbNameStatsdDataFactory' =>
- function ( MediaWikiServices $services ) :
IBufferingStatsdDataFactory
{
+ function ( MediaWikiServices $services ) :
StatsdDataFactoryInterface
{
$config = $services->getMainConfig();
$wiki = $config->get( 'DBname' );
$config = $services->getMainConfig();
$wiki = $config->get( 'DBname' );
- return new BufferingStatsdDataFactory(
- rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' ) . '.' . $wiki
+ return new PrefixingStatsdDataFactoryProxy(
+ $services->getStatsdDataFactory(),
+ $wiki
);
},
);
},