Remove Wikipedia/Wikimedia specific translations

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

diff --git a/maintenance/nextJobDB.php b/maintenance/nextJobDB.php
index 3073227..b2500ca 100644 (file)
--- a/maintenance/nextJobDB.php
+++ b/maintenance/nextJobDB.php
@@ -12,12 +12,18 @@ $type = isset($options['type'])
                ? $options['type']
                : false;
 
-$pendingDBs = $wgMemc->get( 'jobqueue:dbs' );
+$mckey = $type === false
+            ? "jobqueue:dbs"
+            : "jobqueue:dbs:$type";
+
+$pendingDBs = $wgMemc->get( $mckey );
 if ( !$pendingDBs ) {
        $pendingDBs = array();
        # Cross-reference DBs by master DB server
        $dbsByMaster = array();
-       $defaultMaster = $wgAlternateMaster['DEFAULT'];
+       $defaultMaster = isset( $wgAlternateMaster['DEFAULT'] )
+               ? $wgAlternateMaster['DEFAULT']
+               : $wgDBserver;
        foreach ( $wgLocalDatabases as $db ) {
                if ( isset( $wgAlternateMaster[$db] ) ) {
                        $dbsByMaster[$wgAlternateMaster[$db]][] = $db;
@@ -27,7 +33,7 @@ if ( !$pendingDBs ) {
        }
 
        foreach ( $dbsByMaster as $master => $dbs ) {
-               $dbConn = new Database( $master, $wgDBuser, $wgDBpassword );
+               $dbConn = new Database( $master, $wgDBuser, $wgDBpassword, $dbs[0] );
                $stype = $dbConn->addQuotes($type);
 
                # Padding row for MySQL bug
@@ -39,7 +45,7 @@ if ( !$pendingDBs ) {
                        if ($type === false)
                                $sql .= "(SELECT '$dbName' FROM `$dbName`.job LIMIT 1)";
                        else
-                               $sql .= "(SELECT '$dbName' FROM `$dbName`.job WHERE job_cmd='$stype' LIMIT 1)";
+                               $sql .= "(SELECT '$dbName' FROM `$dbName`.job WHERE job_cmd=$stype LIMIT 1)";
                }
                $res = $dbConn->query( $sql, 'nextJobDB.php' );
                $row = $dbConn->fetchRow( $res ); // discard padding row
@@ -48,11 +54,11 @@ if ( !$pendingDBs ) {
                }
        }
 
-       $wgMemc->set( 'jobqueue:dbs', $pendingDBs, 300 );
+       $wgMemc->set( $mckey, $pendingDBs, 300 );
 }
 
 if ( $pendingDBs ) {
        echo $pendingDBs[mt_rand(0, count( $pendingDBs ) - 1)];
 }
 
-?>
+