https://www.mediawiki.org/wiki/Special:Code/MediaWiki/105494
Revision: 105494
Author: awjrichards
Date: 2011-12-07 23:54:53 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
MFT r105492
Modified Paths:
--------------
branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.php
branches/wmf/1.18wmf1/extensions/ContributionReporting/FundraiserStatistics_body.php
Property Changed:
----------------
branches/wmf/1.18wmf1/extensions/ContributionReporting/
branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.php
branches/wmf/1.18wmf1/extensions/ContributionReporting/FundraiserStatistics_body.php
Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/wmf/1.16wmf4/extensions/ContributionReporting:67177,69199,76243,77266
/branches/wmf-deployment/extensions/ContributionReporting:60970
/trunk/extensions/ContributionReporting:64690-67673,76496,76558,76586,76647,77217,77219,77236,102713,103064,103098,103125,103371,103460,103519,103626,103884,103947,103959,103967,103991,103996,104062,104247-104248,104362,104370,104372,104424-104425,104428,104478,104481,104515,104889,104904,105051,105064,105145,105214,105353,105454
/trunk/phase3/extensions/ContributionReporting:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,77555,77558-77560,77563-77565,77573
+
/branches/wmf/1.16wmf4/extensions/ContributionReporting:67177,69199,76243,77266
/branches/wmf-deployment/extensions/ContributionReporting:60970
/trunk/extensions/ContributionReporting:64690-67673,76496,76558,76586,76647,77217,77219,77236,102713,103064,103098,103125,103371,103460,103519,103626,103884,103947,103959,103967,103991,103996,104062,104247-104248,104362,104370,104372,104424-104425,104428,104478,104481,104515,104889,104904,105051,105064,105145,105214,105353,105454,105492
/trunk/phase3/extensions/ContributionReporting:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,77555,77558-77560,77563-77565,77573
Modified:
branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.php
===================================================================
---
branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.php
2011-12-07 23:54:51 UTC (rev 105493)
+++
branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.php
2011-12-07 23:54:53 UTC (rev 105494)
@@ -115,9 +115,12 @@
$egFundraiserStatisticsMinimum = 1;
$egFundraiserStatisticsMaximum = 10000;
-// Cache timeout for fundraiser statistics, in seconds
+// Cache timeout for fundraiser statistics (short timeout), in seconds
$egFundraiserStatisticsCacheTimeout = 900; // 15 minutes
+// Cache timeout for fundraiser statistics (long timeout), in seconds
+$wgFundraiserStatisticsLongCacheTimeout = 60 * 60 * 24 * 7; // one week
+
$wgContributionTrackingStatisticsViewWeeks = 3;
$commonModuleInfo = array(
Property changes on:
branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.php
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/wmf/1.16wmf4/extensions/ContributionReporting/ContributionReporting.php:67177,69199,76243,77266
/branches/wmf-deployment/extensions/ContributionReporting/ContributionReporting.php:60970
/trunk/extensions/ContributionReporting/ContributionReporting.php:64690-67673,75680,76496,76558,76586,76647,77217,77219,77236,102035,102430,103064,103125,103626,103884,103947,103959,103967,103991,103996,104370,104372,104424-104425,104428,104478,104481,104515,104889,104904,105051,105064,105145,105214,105353,105454
/trunk/phase3/extensions/ContributionReporting/ContributionReporting.php:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,77555,77558-77560,77563-77565,77573
+
/branches/wmf/1.16wmf4/extensions/ContributionReporting/ContributionReporting.php:67177,69199,76243,77266
/branches/wmf-deployment/extensions/ContributionReporting/ContributionReporting.php:60970
/trunk/extensions/ContributionReporting/ContributionReporting.php:64690-67673,75680,76496,76558,76586,76647,77217,77219,77236,102035,102430,103064,103125,103626,103884,103947,103959,103967,103991,103996,104370,104372,104424-104425,104428,104478,104481,104515,104889,104904,105051,105064,105145,105214,105353,105454,105492
/trunk/phase3/extensions/ContributionReporting/ContributionReporting.php:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,77555,77558-77560,77563-77565,77573
Modified:
branches/wmf/1.18wmf1/extensions/ContributionReporting/FundraiserStatistics_body.php
===================================================================
---
branches/wmf/1.18wmf1/extensions/ContributionReporting/FundraiserStatistics_body.php
2011-12-07 23:54:51 UTC (rev 105493)
+++
branches/wmf/1.18wmf1/extensions/ContributionReporting/FundraiserStatistics_body.php
2011-12-07 23:54:53 UTC (rev 105494)
@@ -312,7 +312,7 @@
* @return an array of results or null
*/
private function query( $mostRecent, $start, $end ) {
- global $wgMemc, $egFundraiserStatisticsMinimum,
$egFundraiserStatisticsMaximum, $egFundraiserStatisticsCacheTimeout;
+ global $wgMemc, $egFundraiserStatisticsMinimum,
$egFundraiserStatisticsMaximum, $egFundraiserStatisticsCacheTimeout,
$wgFundraiserStatisticsLongCacheTimeout;
// Conctruct the key for memcached
$key = wfMemcKey( 'fundraiserstatistics', $start, $end );
@@ -359,11 +359,11 @@
if ( isset( $result ) ) {
// Store the result in memcached.
// If it's the most recent fundraiser, cache for a
short period of time, otherwise
- // cache for 24 hours (since the query is expensive).
+ // cache for long period of time
if ( $mostRecent ) {
$wgMemc->set( $key, $result,
$egFundraiserStatisticsCacheTimeout );
} else {
- $wgMemc->set( $key, $result, 86400 );
+ $wgMemc->set( $key, $result,
$wgFundraiserStatisticsLongCacheTimeout );
}
return $result;
}
Property changes on:
branches/wmf/1.18wmf1/extensions/ContributionReporting/FundraiserStatistics_body.php
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/wmf/1.16wmf4/extensions/ContributionReporting/FundraiserStatistics_body.php:67177,69199,76243,77266
/branches/wmf-deployment/extensions/ContributionReporting/FundraiserStatistics_body.php:60970
/trunk/extensions/ContributionReporting/FundraiserStatistics_body.php:64690-67673,75671,76496,76558,76586,76596-78420,78787,80954-80955,82413,102035,102211,103626,104370,104372,104424-104425,104428,104478,104481,104515,104889,104904,105051,105064,105145,105214,105353,105454
/trunk/phase3/extensions/ContributionReporting/FundraiserStatistics_body.php:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,77555,77558-77560,77563-77565,77573
+
/branches/wmf/1.16wmf4/extensions/ContributionReporting/FundraiserStatistics_body.php:67177,69199,76243,77266
/branches/wmf-deployment/extensions/ContributionReporting/FundraiserStatistics_body.php:60970
/trunk/extensions/ContributionReporting/FundraiserStatistics_body.php:64690-67673,75671,76496,76558,76586,76596-78420,78787,80954-80955,82413,102035,102211,103626,104370,104372,104424-104425,104428,104478,104481,104515,104889,104904,105051,105064,105145,105214,105353,105454,105492
/trunk/phase3/extensions/ContributionReporting/FundraiserStatistics_body.php:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,77555,77558-77560,77563-77565,77573
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
