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 "Change 'editfont' default preference to 'monospace'"
[lhc/web/wiklou.git]
/
includes
/
libs
/
rdbms
/
lbfactory
/
LBFactory.php
diff --git
a/includes/libs/rdbms/lbfactory/LBFactory.php
b/includes/libs/rdbms/lbfactory/LBFactory.php
index
3567204
..
c891fb6
100644
(file)
--- a/
includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/
includes/libs/rdbms/lbfactory/LBFactory.php
@@
-55,7
+55,7
@@
abstract class LBFactory implements ILBFactory {
/** @var BagOStuff */
protected $srvCache;
/** @var BagOStuff */
/** @var BagOStuff */
protected $srvCache;
/** @var BagOStuff */
- protected $mem
Cache
;
+ protected $mem
Stash
;
/** @var WANObjectCache */
protected $wanCache;
/** @var WANObjectCache */
protected $wanCache;
@@
-93,7
+93,7
@@
abstract class LBFactory implements ILBFactory {
}
$this->srvCache = isset( $conf['srvCache'] ) ? $conf['srvCache'] : new EmptyBagOStuff();
}
$this->srvCache = isset( $conf['srvCache'] ) ? $conf['srvCache'] : new EmptyBagOStuff();
- $this->mem
Cache = isset( $conf['memCache'] ) ? $conf['memCache
'] : new EmptyBagOStuff();
+ $this->mem
Stash = isset( $conf['memStash'] ) ? $conf['memStash
'] : new EmptyBagOStuff();
$this->wanCache = isset( $conf['wanCache'] )
? $conf['wanCache']
: WANObjectCache::newEmpty();
$this->wanCache = isset( $conf['wanCache'] )
? $conf['wanCache']
: WANObjectCache::newEmpty();
@@
-435,7
+435,7
@@
abstract class LBFactory implements ILBFactory {
}
$this->chronProt = new ChronologyProtector(
}
$this->chronProt = new ChronologyProtector(
- $this->mem
Cache
,
+ $this->mem
Stash
,
[
'ip' => $this->requestInfo['IPAddress'],
'agent' => $this->requestInfo['UserAgent'],
[
'ip' => $this->requestInfo['IPAddress'],
'agent' => $this->requestInfo['UserAgent'],
@@
-530,7
+530,7
@@
abstract class LBFactory implements ILBFactory {
$prefix
);
$prefix
);
- $this->forEachLB( function( ILoadBalancer $lb ) use ( $prefix ) {
+ $this->forEachLB( function
( ILoadBalancer $lb ) use ( $prefix ) {
$lb->setDomainPrefix( $prefix );
} );
}
$lb->setDomainPrefix( $prefix );
} );
}