From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 22 May 2013 23:26:46 +0000 (-0700)
Subject: Actually update $lastTime in runJobs.php
X-Git-Tag: 1.31.0-rc.0~19590
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=e990facd730ef042516a25d67f2ed86ec352096b;p=lhc%2Fweb%2Fwiklou.git

Actually update $lastTime in runJobs.php

Change-Id: Ic51b0941aa72f444b1bad919e6a05ff0ba273ce7
---

diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index 0f4c184c45..6a6f9d2723 100644
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -84,7 +84,7 @@ class RunJobs extends Maintenance {
 		}
 
 		$flags = JobQueueGroup::USE_CACHE | JobQueueGroup::USE_PRIORITY;
-		$lastTime = time();
+		$lastTime = time(); // time since last slave check
 		do {
 			$job = ( $type === false )
 				? $group->pop( JobQueueGroup::TYPE_DEFAULT, $flags )
@@ -129,6 +129,7 @@ class RunJobs extends Maintenance {
 				$timePassed = time() - $lastTime;
 				if ( $timePassed >= 5 || $timePassed < 0 ) {
 					wfWaitForSlaves();
+					$lastTime = time();
 				}
 				// Don't let any queue slaves/backups fall behind
 				if ( $jobsRun > 0 && ( $jobsRun % 100 ) == 0 ) {