X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FrunJobs.php;h=6068311e9928023c1441d0a94126346ed0a6b5c1;hb=8824515e571eadd4a63b09e1331f35309315603f;hp=d610b8cc32b43fdb2e76725c3093aa4d4e7fe960;hpb=10f9bbb7710a9a6b7f2c995b84f5cf6cfbfdb943;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index d610b8cc32..6068311e99 100644
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -1,52 +1,110 @@
 <?php
 /**
- * @file
+ * This script starts pending jobs.
+ *
+ * Usage:
+ *  --maxjobs <num> (default 10000)
+ *  --type <job_cmd>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @ingroup Maintenance
  */
 
-$optionsWithArgs = array( 'maxjobs', 'type' );
-$wgUseNormalUser = true;
-require_once( 'commandLine.inc' );
-require_once( "$IP/includes/JobQueue.php" );
-require_once( "$IP/includes/FakeTitle.php" );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
-if ( isset( $options['maxjobs'] ) ) {
-	$maxJobs = $options['maxjobs'];
-} else {
-	$maxJobs = 10000;
-}
+class RunJobs extends Maintenance {
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Run pending jobs";
+		$this->addOption( 'maxjobs', 'Maximum number of jobs to run', false, true );
+		$this->addOption( 'maxtime', 'Maximum amount of wall-clock time', false, true );
+		$this->addOption( 'type', 'Type of job to run', false, true );
+		$this->addOption( 'procs', 'Number of processes to use', false, true );
+	}
+
+	public function memoryLimit() {
+		// Don't eat all memory on the machine if we get a bad job.
+		return "150M";
+	}
 
-$type = false;
-if ( isset( $options['type'] ) )
-	$type = $options['type'];
-
-$wgTitle = Title::newFromText( 'RunJobs.php' );
-
-$dbw = wfGetDB( DB_MASTER );
-$n = 0;
-$conds = '';
-if ($type !== false)
-	$conds = "job_cmd = " . $dbw->addQuotes($type);
-
-while ( $dbw->selectField( 'job', 'count(*)', $conds, 'runJobs.php' ) ) {
-	$offset=0;
-	for (;;) {
-		$job = ($type == false) ?
-				Job::pop($offset)
-				: Job::pop_type($type);
-
-		if ($job == false)
-			break;
-
-		wfWaitForSlaves( 5 );
-		print wfTimestamp( TS_DB ) . "  " . $job->id . "  " . $job->toString() . "\n";
-		$offset=$job->id;
-		if ( !$job->run() ) {
-			print wfTimestamp( TS_DB ) . "  Error: {$job->error}\n";
+	public function execute() {
+		global $wgTitle;
+		if ( $this->hasOption( 'procs' ) ) {
+			$procs = intval( $this->getOption( 'procs' ) );
+			if ( $procs < 1 || $procs > 1000 ) {
+				$this->error( "Invalid argument to --procs", true );
+			}
+			$fc = new ForkController( $procs );
+			if ( $fc->start() != 'child' ) {
+				exit( 0 );
+			}
 		}
-		if ( $maxJobs && ++$n > $maxJobs ) {
-			break 2;
+		$maxJobs = $this->getOption( 'maxjobs', false );
+		$maxTime = $this->getOption( 'maxtime', false );
+		$startTime = time();
+		$type = $this->getOption( 'type', false );
+		$wgTitle = Title::newFromText( 'RunJobs.php' );
+		$dbw = wfGetDB( DB_MASTER );
+		$n = 0;
+		$conds = '';
+		if ( $type !== false ) {
+			$conds = "job_cmd = " . $dbw->addQuotes( $type );
 		}
+
+		while ( $dbw->selectField( 'job', 'job_id', $conds, 'runJobs.php' ) ) {
+			$offset = 0;
+			for ( ; ; ) {
+				$job = !$type ? Job::pop( $offset ) : Job::pop_type( $type );
+
+				if ( !$job ) {
+					break;
+				}
+
+				wfWaitForSlaves();
+				$t = microtime( true );
+				$offset = $job->id;
+				$status = $job->run();
+				$t = microtime( true ) - $t;
+				$timeMs = intval( $t * 1000 );
+				if ( !$status ) {
+					$this->runJobsLog( $job->toString() . " t=$timeMs error={$job->error}" );
+				} else {
+					$this->runJobsLog( $job->toString() . " t=$timeMs good" );
+				}
+
+				if ( $maxJobs && ++$n > $maxJobs ) {
+					break 2;
+				}
+				if ( $maxTime && time() - $startTime > $maxTime ) {
+					break 2;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Log the job message
+	 * @param $msg String The message to log
+	 */
+	private function runJobsLog( $msg ) {
+		$this->output( wfTimestamp( TS_DB ) . " $msg\n" );
+		wfDebugLog( 'runJobs', $msg );
 	}
 }
 
+$maintClass = "RunJobs";
+require_once( RUN_MAINTENANCE_IF_MAIN );