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 "Fix docs for LanguageLinks hook"
[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
f5d57c4
..
4fb5b38
100644
(file)
--- a/
includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/
includes/libs/rdbms/lbfactory/LBFactory.php
@@
-22,6
+22,7
@@
*/
use Psr\Log\LoggerInterface;
*/
use Psr\Log\LoggerInterface;
+use Wikimedia\ScopedCallback;
/**
* An interface for generating database load balancers
/**
* An interface for generating database load balancers
@@
-96,7
+97,7
@@
abstract class LBFactory implements ILBFactory {
$this->errorLogger = isset( $conf['errorLogger'] )
? $conf['errorLogger']
: function ( Exception $e ) {
$this->errorLogger = isset( $conf['errorLogger'] )
? $conf['errorLogger']
: function ( Exception $e ) {
- trigger_error( E_WARNING, get_class( $e ) . ': ' . $e->getMessage() );
+ trigger_error( E_
USER_
WARNING, get_class( $e ) . ': ' . $e->getMessage() );
};
$this->profiler = isset( $params['profiler'] ) ? $params['profiler'] : null;
};
$this->profiler = isset( $params['profiler'] ) ? $params['profiler'] : null;
@@
-145,25
+146,23
@@
abstract class LBFactory implements ILBFactory {
/**
* @see ILBFactory::getMainLB()
* @param bool $domain
/**
* @see ILBFactory::getMainLB()
* @param bool $domain
- * @return
mixed
+ * @return
LoadBalancer
*/
abstract public function getMainLB( $domain = false );
/**
* @see ILBFactory::newExternalLB()
* @param string $cluster
*/
abstract public function getMainLB( $domain = false );
/**
* @see ILBFactory::newExternalLB()
* @param string $cluster
- * @param bool $domain
* @return LoadBalancer
*/
* @return LoadBalancer
*/
- abstract public function newExternalLB( $cluster
, $domain = false
);
+ abstract public function newExternalLB( $cluster );
/**
* @see ILBFactory::getExternalLB()
* @param string $cluster
/**
* @see ILBFactory::getExternalLB()
* @param string $cluster
- * @param bool $domain
- * @return mixed
+ * @return LoadBalancer
*/
*/
- abstract public function getExternalLB( $cluster
, $domain = false
);
+ abstract public function getExternalLB( $cluster );
/**
* Call a method of each tracked load balancer
/**
* Call a method of each tracked load balancer
@@
-356,6
+355,7
@@
abstract class LBFactory implements ILBFactory {
if ( $failed ) {
throw new DBReplicationWaitError(
if ( $failed ) {
throw new DBReplicationWaitError(
+ null,
"Could not wait for replica DBs to catch up to " .
implode( ', ', $failed )
);
"Could not wait for replica DBs to catch up to " .
implode( ', ', $failed )
);