X-Git-Url: http://git.cyclocoop.org/%28?a=blobdiff_plain;f=includes%2FSiteStats.php;h=215378bcdbcb1aea8c6fc32104028ac0be881371;hb=b3b2214a718e737d4921536c33922295d451341f;hp=580f7ccb19aa6c513a64b7401891bf62547c99fe;hpb=40a628a501fc05bb00e834fe359ca4061925f320;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SiteStats.php b/includes/SiteStats.php index 580f7ccb19..215378bcdb 100644 --- a/includes/SiteStats.php +++ b/includes/SiteStats.php @@ -36,9 +36,6 @@ class SiteStats { /** @var int[] */ private static $pageCount = []; - /** @var int[] */ - private static $groupMemberCounts = []; - static function recache() { self::load( true ); } @@ -205,8 +202,11 @@ class SiteStats { */ static function jobs() { if ( !isset( self::$jobs ) ) { - $dbr = wfGetDB( DB_SLAVE ); - 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 @@ -289,8 +289,10 @@ class SiteStatsInit { public function __construct( $database = false ) { if ( $database instanceof IDatabase ) { $this->db = $database; + } elseif ( $database ) { + $this->db = wfGetDB( DB_MASTER ); } else { - $this->db = wfGetDB( $database ? DB_MASTER : DB_SLAVE ); + $this->db = wfGetDB( DB_SLAVE, 'vslow' ); } }