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
* Introduced LBFactory -- an abstract class for configuring database load balancers...
[lhc/web/wiklou.git]
/
maintenance
/
nextJobDB.php
diff --git
a/maintenance/nextJobDB.php
b/maintenance/nextJobDB.php
index
b2500ca
..
b9e4493
100644
(file)
--- a/
maintenance/nextJobDB.php
+++ b/
maintenance/nextJobDB.php
@@
-21,19
+21,13
@@
if ( !$pendingDBs ) {
$pendingDBs = array();
# Cross-reference DBs by master DB server
$dbsByMaster = array();
$pendingDBs = array();
# Cross-reference DBs by master DB server
$dbsByMaster = array();
- $defaultMaster = isset( $wgAlternateMaster['DEFAULT'] )
- ? $wgAlternateMaster['DEFAULT']
- : $wgDBserver;
foreach ( $wgLocalDatabases as $db ) {
foreach ( $wgLocalDatabases as $db ) {
- if ( isset( $wgAlternateMaster[$db] ) ) {
- $dbsByMaster[$wgAlternateMaster[$db]][] = $db;
- } else {
- $dbsByMaster[$defaultMaster][] = $db;
- }
+ $lb = wfGetLB( $db );
+ $dbsByMaster[$lb->getServerName(0)][] = $db;
}
foreach ( $dbsByMaster as $master => $dbs ) {
}
foreach ( $dbsByMaster as $master => $dbs ) {
- $dbConn =
new Database( $master, $wgDBuser, $wgDBpassword
, $dbs[0] );
+ $dbConn =
wfGetDB( DB_MASTER, array()
, $dbs[0] );
$stype = $dbConn->addQuotes($type);
# Padding row for MySQL bug
$stype = $dbConn->addQuotes($type);
# Padding row for MySQL bug