X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FGlobalFunctions.php;h=4f121107e2977f412aeaaa785229560fc02cfcb8;hb=261236c964b8862e5fa7566fad9a5fce0c2048d5;hp=d215e9f56ec704cee75dc48b811e2983fb631212;hpb=4e021bb8d4741d5af0f02942fe3c33a19e7fabca;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index d215e9f56e..4f121107e2 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -30,7 +30,6 @@ use MediaWiki\Session\SessionManager;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Shell\Shell;
 use Wikimedia\ScopedCallback;
-use Wikimedia\Rdbms\DBReplicationWaitError;
 use Wikimedia\WrappedString;
 
 /**
@@ -2922,17 +2921,13 @@ function wfGetNull() {
  * @param float|null $ifWritesSince Only wait if writes were done since this UNIX timestamp
  * @param string|bool $wiki Wiki identifier accepted by wfGetLB
  * @param string|bool $cluster Cluster name accepted by LBFactory. Default: false.
- * @param int|null $timeout Max wait time. Default: 1 day (cli), ~10 seconds (web)
+ * @param int|null $timeout Max wait time. Default: 60 seconds (cli), 1 second (web)
  * @return bool Success (able to connect and no timeouts reached)
  * @deprecated since 1.27 Use LBFactory::waitForReplication
  */
 function wfWaitForSlaves(
 	$ifWritesSince = null, $wiki = false, $cluster = false, $timeout = null
 ) {
-	if ( $timeout === null ) {
-		$timeout = wfIsCLI() ? 60 : 10;
-	}
-
 	if ( $cluster === '*' ) {
 		$cluster = false;
 		$wiki = false;
@@ -2940,20 +2935,18 @@ function wfWaitForSlaves(
 		$wiki = wfWikiID();
 	}
 
-	try {
-		$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
-		$lbFactory->waitForReplication( [
-			'wiki' => $wiki,
-			'cluster' => $cluster,
-			'timeout' => $timeout,
-			// B/C: first argument used to be "max seconds of lag"; ignore such values
-			'ifWritesSince' => ( $ifWritesSince > 1e9 ) ? $ifWritesSince : null
-		] );
-	} catch ( DBReplicationWaitError $e ) {
-		return false;
+	$opts = [
+		'wiki' => $wiki,
+		'cluster' => $cluster,
+		// B/C: first argument used to be "max seconds of lag"; ignore such values
+		'ifWritesSince' => ( $ifWritesSince > 1e9 ) ? $ifWritesSince : null
+	];
+	if ( $timeout !== null ) {
+		$opts['timeout'] = $timeout;
 	}
 
-	return true;
+	$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+	return $lbFactory->waitForReplication( $opts );
 }
 
 /**