Merge "mediawiki.api.upload: Unbreak finishing stash uploads"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 21 Apr 2016 15:49:17 +0000 (15:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 21 Apr 2016 15:49:17 +0000 (15:49 +0000)
includes/SiteStats.php

index 4908419..215378b 100644 (file)
@@ -202,7 +202,11 @@ class SiteStats {
         */
        static function jobs() {
                if ( !isset( self::$jobs ) ) {
-                       self::$jobs = array_sum( JobQueueGroup::singleton()->getQueueSizes() );
+                       try{
+                               self::$jobs = array_sum( JobQueueGroup::singleton()->getQueueSizes() );
+                       } catch ( JobQueueError $e ) {
+                               self::$jobs = 0;
+                       }
                        /**
                         * Zero rows still do single row read for row that doesn't exist,
                         * but people are annoyed by that