jenkins-bot has submitted this change and it was merged.
Change subject: Tweaked some of the default LockManager ttls
......................................................................
Tweaked some of the default LockManager ttls
Change-Id: Ic2c58ef02dc686f38840fe974a9d2858cd15c019
---
M includes/filebackend/lockmanager/LockManager.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filebackend/lockmanager/LockManager.php
b/includes/filebackend/lockmanager/LockManager.php
index df8d2d4..762bc66 100644
--- a/includes/filebackend/lockmanager/LockManager.php
+++ b/includes/filebackend/lockmanager/LockManager.php
@@ -72,9 +72,9 @@
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 );
--
To view, visit https://gerrit.wikimedia.org/r/168543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2c58ef02dc686f38840fe974a9d2858cd15c019
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
