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 "Replace pauses in rollback tests w/ dynamic waits"
[lhc/web/wiklou.git]
/
includes
/
Storage
/
BlobStoreFactory.php
diff --git
a/includes/Storage/BlobStoreFactory.php
b/includes/Storage/BlobStoreFactory.php
index
63ca74d
..
4e1f97f
100644
(file)
--- a/
includes/Storage/BlobStoreFactory.php
+++ b/
includes/Storage/BlobStoreFactory.php
@@
-23,7
+23,7
@@
namespace MediaWiki\Storage;
use Config;
use Language;
use WANObjectCache;
use Config;
use Language;
use WANObjectCache;
-use Wikimedia\Rdbms\L
oadBalancer
;
+use Wikimedia\Rdbms\L
BFactory
;
/**
* Service for instantiating BlobStores
/**
* Service for instantiating BlobStores
@@
-35,9
+35,9
@@
use Wikimedia\Rdbms\LoadBalancer;
class BlobStoreFactory {
/**
class BlobStoreFactory {
/**
- * @var L
oadBalancer
+ * @var L
BFactory
*/
*/
- private $l
oadBalancer
;
+ private $l
bFactory
;
/**
* @var WANObjectCache
/**
* @var WANObjectCache
@@
-55,12
+55,12
@@
class BlobStoreFactory {
private $contLang;
public function __construct(
private $contLang;
public function __construct(
- L
oadBalancer $loadBalancer
,
+ L
BFactory $lbFactory
,
WANObjectCache $cache,
Config $mainConfig,
Language $contLang
) {
WANObjectCache $cache,
Config $mainConfig,
Language $contLang
) {
- $this->l
oadBalancer = $loadBalancer
;
+ $this->l
bFactory = $lbFactory
;
$this->cache = $cache;
$this->config = $mainConfig;
$this->contLang = $contLang;
$this->cache = $cache;
$this->config = $mainConfig;
$this->contLang = $contLang;
@@
-85,8
+85,9
@@
class BlobStoreFactory {
* @return SqlBlobStore
*/
public function newSqlBlobStore( $wikiId = false ) {
* @return SqlBlobStore
*/
public function newSqlBlobStore( $wikiId = false ) {
+ $lb = $this->lbFactory->getMainLB( $wikiId );
$store = new SqlBlobStore(
$store = new SqlBlobStore(
- $
this->loadBalancer
,
+ $
lb
,
$this->cache,
$wikiId
);
$this->cache,
$wikiId
);