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

Move MemcachedBagOStuff b/c logic to ObjectCache

Browse source 
Change-Id: Iedb173b00d543237b3e7560b8079b8d488e00d80
This commit is contained in:
Aaron Schulz 2015-10-24 14:47:19 -07:00
parent d2905ca6bf
commit 0dd27b1da9
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/objectcache/MemcachedBagOStuff.php
View file

@ -37,21 +37,9 @@ class MemcachedBagOStuff extends BagOStuff {
* @return array
*/
protected function applyDefaultParams( $params ) {
if ( !isset( $params['servers'] ) ) {
$params['servers'] = $GLOBALS['wgMemCachedServers'];
}
if ( !isset( $params['debug'] ) ) {
$params['debug'] = $GLOBALS['wgMemCachedDebug'];
}
if ( !isset( $params['persistent'] ) ) {
$params['persistent'] = $GLOBALS['wgMemCachedPersistent'];
}
if ( !isset( $params['compress_threshold'] ) ) {
$params['compress_threshold'] = 1500;
}
if ( !isset( $params['timeout'] ) ) {
$params['timeout'] = $GLOBALS['wgMemCachedTimeout'];
}
if ( !isset( $params['connect_timeout'] ) ) {
$params['connect_timeout'] = 0.5;
}

22
includes/objectcache/ObjectCache.php
View file

@ -178,8 +178,26 @@ class ObjectCache {
return call_user_func( $params['factory'], $params );
} elseif ( isset( $params['class'] ) ) {
$class = $params['class'];
if ( $class === 'MultiWriteBagOStuff' && !isset( $params['asyncHandler'] ) ) {
$params['asyncHandler'] = 'DeferredUpdates::addCallableUpdate';
// Automatically set the 'async' update handler
if ( $class === 'MultiWriteBagOStuff' ) {
$params['asyncHandler'] = isset( $params['asyncHandler'] )
? $params['asyncHandler']
: 'DeferredUpdates::addCallableUpdate';
}
// Do b/c logic for MemcachedBagOStuff
if ( is_subclass_of( $class, 'MemcachedBagOStuff' ) ) {
if ( !isset( $params['servers'] ) ) {
$params['servers'] = $GLOBALS['wgMemCachedServers'];
}
if ( !isset( $params['debug'] ) ) {
$params['debug'] = $GLOBALS['wgMemCachedDebug'];
}
if ( !isset( $params['persistent'] ) ) {
$params['persistent'] = $GLOBALS['wgMemCachedPersistent'];
}
if ( !isset( $params['timeout'] ) ) {
$params['timeout'] = $GLOBALS['wgMemCachedTimeout'];
}
}
return new $class( $params );
} else {