X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FrunJobs.php;h=acadcf67c8fc329019b5eeb7734cfc82e3eb8321;hb=2a80a8689865c0d6ea80154a5d17c0e5fe41e495;hp=530a406337c5f77a0178102aeaaf50989888de94;hpb=bd1747f28649507058a970a7fe11e3213f8aa8fd;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index 530a406337..acadcf67c8 100644
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -1,31 +1,100 @@
 <?php
+/**
+ * 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' );
-$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;
-}
-
-$wgTitle = Title::newFromText( 'RunJobs.php' );
+class RunJobs extends Maintenance {
+	public function __construct() {
+		global $wgUseNormalUser;
+		parent::__construct();
+		$this->mDescription = "Run pending jobs";
+		$this->addOption( 'maxjobs', 'Maximum number of jobs to run', false, true );
+		$this->addOption( 'type', 'Type of job to run', false, true );
+		$this->addOption( 'procs', 'Number of processes to use', false, true );
+		$wgUseNormalUser = true;
+	}
 
-$dbw =& wfGetDB( DB_MASTER );
-$n = 0;
-while ( $dbw->selectField( 'job', 'count(*)', '', 'runJobs.php' ) ) {
-	while ( false != ($job = Job::pop()) ) {
-		wfWaitForSlaves( 5 );
-		print $job->id . "  " . $job->toString() . "\n";
-		if ( !$job->run() ) {
-			print "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( $procs ) != 'child' ) {
+				exit( 0 );
+			}
 		}
-		if ( $maxJobs && ++$n > $maxJobs ) {
-			break 2;
+		$maxJobs = $this->getOption( 'maxjobs', 10000 );
+		$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 == false) ?
+						Job::pop($offset)
+						: Job::pop_type($type);
+	
+				if ($job == false)
+					break;
+	
+				wfWaitForSlaves( 5 );
+				$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;
+				}
+			}
 		}
 	}
+
+	/**
+	 * 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( DO_MAINTENANCE );