From bab822755f827a7406bd1476ed896c4b93b07fc8 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 25 Apr 2014 14:58:45 -0700 Subject: [PATCH] Removed maximumPeriodicTaskSeconds hack; now unused Change-Id: Ib4308990c21b0118f00fde72412868993c5ce056 --- includes/jobqueue/JobQueueRedis.php | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/includes/jobqueue/JobQueueRedis.php b/includes/jobqueue/JobQueueRedis.php index f5a266e03e..d81a2929cd 100644 --- a/includes/jobqueue/JobQueueRedis.php +++ b/includes/jobqueue/JobQueueRedis.php @@ -71,12 +71,6 @@ class JobQueueRedis extends JobQueue { /** @var string Key to prefix the queue keys with (used for testing) */ protected $key; - /** - * @var null|int maximum seconds between execution of periodic tasks. Used to speed up - * testing but should otherwise be left unset. - */ - protected $maximumPeriodicTaskSeconds; - /** * @params include: * - redisConfig : An array of parameters to RedisConnectionPool::__construct(). @@ -85,10 +79,6 @@ class JobQueueRedis extends JobQueue { * If a hostname is specified but no port, the standard port number * 6379 will be used. Required. * - compression : The type of compression to use; one of (none,gzip). - * - maximumPeriodicTaskSeconds : Maximum seconds between check periodic tasks. Set to - * force faster execution of periodic tasks for inegration tests that - * rely on checkDelay. Without this the integration tests are very very - * slow. This really shouldn't be set in production. * @param array $params */ public function __construct( array $params ) { @@ -97,8 +87,6 @@ class JobQueueRedis extends JobQueue { $this->server = $params['redisServer']; $this->compression = isset( $params['compression'] ) ? $params['compression'] : 'none'; $this->redisPool = RedisConnectionPool::singleton( $params['redisConfig'] ); - $this->maximumPeriodicTaskSeconds = isset( $params['maximumPeriodicTaskSeconds'] ) ? - $params['maximumPeriodicTaskSeconds'] : null; } protected function supportedOrders() { @@ -738,10 +726,7 @@ LUA; } $period = min( $periods ); $period = max( $period, 30 ); // sanity - // Support override for faster testing - if ( $this->maximumPeriodicTaskSeconds !== null ) { - $period = min( $period, $this->maximumPeriodicTaskSeconds ); - } + return array( 'recyclePruneAndUndelayJobs' => array( 'callback' => array( $this, 'recyclePruneAndUndelayJobs' ), -- 2.20.1