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 "rdbms: add "secret" parameter to ChronologyProtector to use HMAC client IDs"
[lhc/web/wiklou.git]
/
includes
/
filerepo
/
ForeignDBViaLBRepo.php
diff --git
a/includes/filerepo/ForeignDBViaLBRepo.php
b/includes/filerepo/ForeignDBViaLBRepo.php
index
302b194
..
ad6ec47
100644
(file)
--- a/
includes/filerepo/ForeignDBViaLBRepo.php
+++ b/
includes/filerepo/ForeignDBViaLBRepo.php
@@
-23,7
+23,7
@@
use MediaWiki\MediaWikiServices;
use Wikimedia\Rdbms\IDatabase;
use MediaWiki\MediaWikiServices;
use Wikimedia\Rdbms\IDatabase;
-use Wikimedia\Rdbms\LoadBalancer;
+use Wikimedia\Rdbms\
I
LoadBalancer;
/**
* A foreign repository with a MediaWiki database accessible via the configured LBFactory
/**
* A foreign repository with a MediaWiki database accessible via the configured LBFactory
@@
-34,12
+34,6
@@
class ForeignDBViaLBRepo extends LocalRepo {
/** @var string */
protected $wiki;
/** @var string */
protected $wiki;
- /** @var string */
- protected $dbName;
-
- /** @var string */
- protected $tablePrefix;
-
/** @var array */
protected $fileFactory = [ ForeignDBFile::class, 'newFromTitle' ];
/** @var array */
protected $fileFactory = [ ForeignDBFile::class, 'newFromTitle' ];
@@
-55,7
+49,6
@@
class ForeignDBViaLBRepo extends LocalRepo {
function __construct( $info ) {
parent::__construct( $info );
$this->wiki = $info['wiki'];
function __construct( $info ) {
parent::__construct( $info );
$this->wiki = $info['wiki'];
- list( $this->dbName, $this->tablePrefix ) = wfSplitWikiID( $this->wiki );
$this->hasSharedCache = $info['hasSharedCache'];
}
$this->hasSharedCache = $info['hasSharedCache'];
}
@@
-83,10
+76,11
@@
class ForeignDBViaLBRepo extends LocalRepo {
}
/**
}
/**
- * @return LoadBalancer
+ * @return
I
LoadBalancer
*/
protected function getDBLoadBalancer() {
$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
*/
protected function getDBLoadBalancer() {
$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+
return $lbFactory->getMainLB( $this->wiki );
}
return $lbFactory->getMainLB( $this->wiki );
}