From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 24 Oct 2014 05:19:19 +0000 (-0700)
Subject: Tweaked some of the default LockManager ttls
X-Git-Tag: 1.31.0-rc.0~13474^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=54f1b2373ba3dc89d6fcbc09f2abde7b56517f88;p=lhc%2Fweb%2Fwiklou.git

Tweaked some of the default LockManager ttls

Change-Id: Ic2c58ef02dc686f38840fe974a9d2858cd15c019
---

diff --git a/includes/filebackend/lockmanager/LockManager.php b/includes/filebackend/lockmanager/LockManager.php
index df8d2d4f0c..762bc66086 100644
--- a/includes/filebackend/lockmanager/LockManager.php
+++ b/includes/filebackend/lockmanager/LockManager.php
@@ -72,9 +72,9 @@ abstract class LockManager {
 	public function __construct( array $config ) {
 		$this->domain = isset( $config['domain'] ) ? $config['domain'] : wfWikiID();
 		if ( isset( $config['lockTTL'] ) ) {
-			$this->lockTTL = max( 1, $config['lockTTL'] );
+			$this->lockTTL = max( 5, $config['lockTTL'] );
 		} elseif ( PHP_SAPI === 'cli' ) {
-			$this->lockTTL = 2 * 3600;
+			$this->lockTTL = 3600;
 		} else {
 			$met = ini_get( 'max_execution_time' ); // this is 0 in CLI mode
 			$this->lockTTL = max( 5 * 60, 2 * (int)$met );