diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2014-10-27 17:51:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2014-10-27 17:51:39 +0000 |
| commit | da6b7ba8d23b480a41ce21896b88c6f67ff1b10c (patch) | |
| tree | 51f1af53eb1028b4ac66f7eae1ae77945eb786ce /includes | |
| parent | b3385d9e9c679dc14db6dab475af430e194003d0 (diff) | |
| parent | 54f1b2373ba3dc89d6fcbc09f2abde7b56517f88 (diff) | |
| download | mediawikicore-da6b7ba8d23b480a41ce21896b88c6f67ff1b10c.tar.gz mediawikicore-da6b7ba8d23b480a41ce21896b88c6f67ff1b10c.zip | |
Merge "Tweaked some of the default LockManager ttls"
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/filebackend/lockmanager/LockManager.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/filebackend/lockmanager/LockManager.php b/includes/filebackend/lockmanager/LockManager.php index df8d2d4f0c56..762bc66086e3 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 ); |