diff options
Diffstat (limited to 'maintenance/nextJobDB.php')
| -rw-r--r-- | maintenance/nextJobDB.php | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/maintenance/nextJobDB.php b/maintenance/nextJobDB.php index b2500caf..6af5cbec 100644 --- a/maintenance/nextJobDB.php +++ b/maintenance/nextJobDB.php @@ -1,7 +1,9 @@ <?php - -/* +/** * Pick a database that has pending jobs + * + * @file + * @ingroup Maintenance */ $options = array( 'type' ); @@ -21,19 +23,13 @@ if ( !$pendingDBs ) { $pendingDBs = array(); # Cross-reference DBs by master DB server $dbsByMaster = array(); - $defaultMaster = isset( $wgAlternateMaster['DEFAULT'] ) - ? $wgAlternateMaster['DEFAULT'] - : $wgDBserver; 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 ) { - $dbConn = new Database( $master, $wgDBuser, $wgDBpassword, $dbs[0] ); + $dbConn = wfGetDB( DB_MASTER, array(), $dbs[0] ); $stype = $dbConn->addQuotes($type); # Padding row for MySQL bug |