From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 29 Sep 2014 18:43:22 +0000 (-0700)
Subject: Lowered ActiveUsers query period to reduce timeouts
X-Git-Tag: 1.31.0-rc.0~13768^2
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=14733fc0075e9a4756c1fbc468e0d72054f99cac;p=lhc%2Fweb%2Fwiklou.git

Lowered ActiveUsers query period to reduce timeouts

Change-Id: If34266cbac79d319fe33e1f362791fb438577fd7
---

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index affddda769..04e9fc4f17 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -50,7 +50,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
 
 		if ( $params['activeusers'] ) {
 			// Update active user cache
-			SpecialActiveUsers::mergeActiveUsers( 600, $activeUserDays );
+			SpecialActiveUsers::mergeActiveUsers( 300, $activeUserDays );
 		}
 
 		$db = $this->getDB();
diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php
index 10ab46a237..6219fc48d2 100644
--- a/includes/specials/SpecialActiveusers.php
+++ b/includes/specials/SpecialActiveusers.php
@@ -259,7 +259,7 @@ class SpecialActiveUsers extends SpecialPage {
 			array( 'activeusers-intro', $this->getLanguage()->formatNum( $days ) ) );
 
 		// Occasionally merge in new updates
-		$seconds = min( self::mergeActiveUsers( 600, $days ), $days * 86400 );
+		$seconds = min( self::mergeActiveUsers( 300, $days ), $days * 86400 );
 		// Mention the level of staleness
 		$out->addWikiMsg( 'cachedspecial-viewing-cached-ttl',
 			$this->getLanguage()->formatDuration( $seconds ) );