Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

objectcache: Log debug message for backend of WANObjectCache

Browse source 
While at it, disuse the static newWANCacheFromParams function
which was only used by ServiceWiring (can now be deprecated,
but done separate for easier backporting).

Now that it is inlined, there is easy access to its logger.

Bug: T234361
Change-Id: I118b6f01e49405984310030d44ee319bb25bfcdb
This commit is contained in:
Timo Tijhof 2019-10-08 22:34:17 +01:00
parent 8631daae64
commit 3828558140
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
includes/ServiceWiring.php
View file

@ -367,14 +367,35 @@ return [
}
$params = $mainConfig->get( 'WANObjectCaches' )[$id];
$logger = LoggerFactory::getInstance( $params['loggroup'] ?? 'objectcache' );
$objectCacheId = $params['cacheId'];
if ( !isset( $mainConfig->get( 'ObjectCaches' )[$objectCacheId] ) ) {
throw new UnexpectedValueException(
"Cache type \"$objectCacheId\" is not present in \$wgObjectCaches." );
}
$params['store'] = $mainConfig->get( 'ObjectCaches' )[$objectCacheId];
$storeParams = $mainConfig->get( 'ObjectCaches' )[$objectCacheId];
$store = ObjectCache::newFromParams( $storeParams );
$logger->debug( 'MainWANObjectCache using store {class}', [
'class' => get_class( $store )
] );
return ObjectCache::newWANCacheFromParams( $params );
$params['logger'] = $logger;
$params['cache'] = $store;
$params['secret'] = $params['secret'] ?? $mainConfig->get( 'SecretKey' );
if ( !$mainConfig->get( 'CommandLineMode' ) ) {
// Send the statsd data post-send on HTTP requests; avoid in CLI mode (T181385)
$params['stats'] = $services->getStatsdDataFactory();
// Let pre-emptive refreshes happen post-send on HTTP requests
$params['asyncHandler'] = [ DeferredUpdates::class, 'addCallableUpdate' ];
}
$class = $params['class'];
$instance = new $class( $params );
'@phan-var WANObjectCache $instance';
return $instance;
},
'MediaHandlerFactory' => function ( MediaWikiServices $services ) : MediaHandlerFactory {