Merge "[FileRepo] Made getDescription() respect *_deleted fields."

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

diff --git a/maintenance/nextJobDB.php b/maintenance/nextJobDB.php
index 2d3608d..ac4e723 100644 (file)
--- a/maintenance/nextJobDB.php
+++ b/maintenance/nextJobDB.php
@@ -37,7 +37,7 @@ class nextJobDB extends Maintenance {
                $memcKey = 'jobqueue:dbs:v2';
                $pendingDBs = $wgMemc->get( $memcKey );
 
-               // If the cache entry wasn't present, or in 1% of cases otherwise, 
+               // If the cache entry wasn't present, or in 1% of cases otherwise,
                // regenerate the cache.
                if ( !$pendingDBs || mt_rand( 0, 100 ) == 0 ) {
                        $pendingDBs = $this->getPendingDbs();
@@ -65,7 +65,7 @@ class nextJobDB extends Maintenance {
                        $candidates = array_values( $candidates );
                        $db = $candidates[ mt_rand( 0, count( $candidates ) - 1 ) ];
                        if ( !$this->checkJob( $type, $db ) ) {
-                               // This job is not available in the current database. Remove it from 
+                               // This job is not available in the current database. Remove it from
                                // the cache.
                                if ( $type === false ) {
                                        foreach ( $pendingDBs as $type2 => $dbs ) {
@@ -85,17 +85,21 @@ class nextJobDB extends Maintenance {
 
        /**
         * Check if the specified database has a job of the specified type in it.
-        * The type may be false to indicate "all". 
+        * The type may be false to indicate "all".
+        * @param $type string
+        * @param $dbName string
+        * @return bool
         */
        function checkJob( $type, $dbName ) {
                $lb = wfGetLB( $dbName );
                $db = $lb->getConnection( DB_MASTER, array(), $dbName );
                if ( $type === false ) {
-                       $conds = array();
+                       $conds = Job::defaultQueueConditions( );
                } else {
                        $conds = array( 'job_cmd' => $type );
                }
 
+
                $exists = (bool) $db->selectField( 'job', '1', $conds, __METHOD__ );
                $lb->reuseConnection( $db );
                return $exists;
@@ -103,7 +107,6 @@ class nextJobDB extends Maintenance {
 
        /**
         * Get all databases that have a pending job
-        * @param $type String Job type
         * @return array
         */
        private function getPendingDbs() {