From: Timo Tijhof Date: Fri, 11 Oct 2019 23:26:18 +0000 (+0100) Subject: localisation: Log debug message for backend of MessageCache X-Git-Tag: 1.34.0-rc.1~35 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=73ef860025ca4bd9a605a013f30e267a5da5d659;ds=sidebyside localisation: Log debug message for backend of MessageCache Bug: T234361 Change-Id: I697626a83cca4c6893cc30ca6ae118f10195624c (cherry picked from commit 8e9adb9486257867385128bd8eedd6e8d6d7035e) --- diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index 94ca8d27fb..e83f62534a 100644 --- a/includes/ServiceWiring.php +++ b/includes/ServiceWiring.php @@ -419,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() );