No point in fetching the result in Database::unlock() if we're not using it anyway.

[lhc/web/wiklou.git] / maintenance / nextJobDB.php

diff --git a/maintenance/nextJobDB.php b/maintenance/nextJobDB.php
index acb277d..6af5cbe 100644 (file)
--- 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,17 +23,13 @@ if ( !$pendingDBs ) {
        $pendingDBs = array();
        # Cross-reference DBs by master DB server
        $dbsByMaster = array();
-       $defaultMaster = $wgAlternateMaster['DEFAULT'];
        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