Removed maximumPeriodicTaskSeconds hack; now unused

Change-Id: Ib4308990c21b0118f00fde72412868993c5ce056
This commit is contained in:
Aaron Schulz 2014-04-25 14:58:45 -07:00
parent de442f5973
commit bab822755f

View file

@ -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' ),