X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=e83f62534a1104ee439e3dd673facd51ec536e4f;hb=25242105e8fd03c9900250bdf9ea91be9a286625;hp=6e31e864d94e5958f3144f1d79b4ff016ede7d8e;hpb=bb2e73ccf376f4f3a78d02104805af7c7aa80e45;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 6e31e864d9..e83f62534a 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -262,7 +262,7 @@ return [
 
 	'LanguageNameUtils' => function ( MediaWikiServices $services ) : LanguageNameUtils {
 		return new LanguageNameUtils( new ServiceOptions(
-			LanguageNameUtils::$constructorOptions,
+			LanguageNameUtils::CONSTRUCTOR_OPTIONS,
 			$services->getMainConfig()
 		) );
 	},
@@ -359,7 +359,15 @@ return [
 				"Cache type \"$id\" is not present in \$wgObjectCaches." );
 		}
 
-		return ObjectCache::newFromParams( $mainConfig->get( 'ObjectCaches' )[$id] );
+		$params = $mainConfig->get( 'ObjectCaches' )[$id];
+		$logger = $params['logger'] = LoggerFactory::getInstance( $params['loggroup'] ?? 'objectcache' );
+
+		$store = ObjectCache::newFromParams( $params );
+		$logger->debug( 'MainObjectStash using store {class}', [
+			'class' => get_class( $store )
+		] );
+
+		return $store;
 	},
 
 	'MainWANObjectCache' => function ( MediaWikiServices $services ) : WANObjectCache {
@@ -411,12 +419,21 @@ return [
 
 	'MessageCache' => function ( MediaWikiServices $services ) : MessageCache {
 		$mainConfig = $services->getMainConfig();
+		$clusterCache = ObjectCache::getInstance( $mainConfig->get( 'MessageCacheType' ) );
+		$srvCache = $mainConfig->get( 'UseLocalMessageCache' )
+			? $services->getLocalServerObjectCache()
+			: new EmptyBagOStuff();
+
+		// TODO: Inject this into MessageCache.
+		$logger = LoggerFactory::getInstance( 'MessageCache' );
+		$logger->debug( 'MessageCache using store {class}', [
+			'class' => get_class( $clusterCache )
+		] );
+
 		return new MessageCache(
 			$services->getMainWANObjectCache(),
-			ObjectCache::getInstance( $mainConfig->get( 'MessageCacheType' ) ),
-			$mainConfig->get( 'UseLocalMessageCache' )
-				? $services->getLocalServerObjectCache()
-				: new EmptyBagOStuff(),
+			$clusterCache,
+			$srvCache,
 			$mainConfig->get( 'UseDatabaseMessages' ),
 			$services->getContentLanguage()
 		);