X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=blobdiff_plain;f=maintenance%2FrunJobs.php;h=52f0462a113b3d352d341304ca040103d52bf23d;hb=7465a1b83d591c3594f931f43b3f3f97354dedda;hp=929c2fd3aba5687e1dd0b25e18d8ed7fc1befcdb;hpb=32df0871b48a4df9732862e9ed403ab6549cb10e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index 929c2fd3ab..52f0462a11 100644
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -92,9 +92,11 @@ class RunJobs extends Maintenance {
 				++$jobsRun;
 				$this->runJobsLog( $job->toString() . " STARTING" );
 
+				// Set timer to stop the job if too much CPU time is used
+				set_time_limit( $maxTime ?: 0 );
 				// Run the job...
-				$t = microtime( true );
 				wfProfileIn( __METHOD__ . '-' . get_class( $job ) );
+				$t = microtime( true );
 				try {
 					$status = $job->run();
 					$error = $job->getLastError();
@@ -103,8 +105,10 @@ class RunJobs extends Maintenance {
 					$error = get_class( $e ) . ': ' . $e->getMessage();
 					$e->report(); // write error to STDERR and the log
 				}
-				wfProfileOut( __METHOD__ . '-' . get_class( $job ) );
 				$timeMs = intval( ( microtime( true ) - $t ) * 1000 );
+				wfProfileOut( __METHOD__ . '-' . get_class( $job ) );
+				// Disable the timer
+				set_time_limit( 0 );
 
 				// Mark the job as done on success or when the job cannot be retried
 				if ( $status !== false || !$job->allowRetries() ) {
@@ -134,10 +138,35 @@ class RunJobs extends Maintenance {
 				if ( $jobsRun > 0 && ( $jobsRun % 100 ) == 0 ) {
 					$group->waitForBackups();
 				}
+
+				// Bail if near-OOM instead of in a job
+				$this->assertMemoryOK();
 			}
 		} while ( $job ); // stop when there are no jobs
 	}
 
+	/**
+	 * Make sure that this script is not too close to the memory usage limit
+	 * @throws MWException
+	 */
+	private function assertMemoryOK() {
+		static $maxBytes = null;
+		if ( $maxBytes === null ) {
+			$m = array();
+			if ( preg_match( '!^(\d+)(k|m|g|)$!i', ini_get( 'memory_limit' ), $m ) ) {
+				list( , $num, $unit ) = $m;
+				$conv = array( 'g' => 1024*1024*1024, 'm' => 1024*1024, 'k' => 1024, '' => 1 );
+				$maxBytes = $num * $conv[strtolower( $unit )];
+			} else {
+				$maxBytes = 0;
+			}
+		}
+		$usedBytes = memory_get_usage();
+		if ( $maxBytes && $usedBytes >= .95*$maxBytes ) {
+			throw new MWException( "Detected excessive memory usage ($usedBytes/$maxBytes)." );
+		}
+	}
+
 	/**
 	 * Log the job message
 	 * @param $msg String The message to log