From: daniel <daniel.kinzler@wikimedia.de>
Date: Thu, 31 Jan 2013 14:36:29 +0000 (+0100)
Subject: Log profiling info from maintenance scripts.
X-Git-Tag: 1.31.0-rc.0~20834^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=2926b29da3038cc4b2b7da7e4c83d6429bbf05a0

Log profiling info from maintenance scripts.

Previously, maintenance scripts did not log profiling info.

Change-Id: Ib63dd54b815cca774cd764f28505f9dbdfd02cfc
---

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 2bb2a0f447..c6768bdf18 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -111,6 +111,9 @@ try {
 
 	// Potentially debug globals
 	$maintenance->globals();
+
+	// log profiling info
+	wfLogProfilingData();
 } catch ( MWException $mwe ) {
 	echo( $mwe->getText() );
 	exit( 1 );
diff --git a/maintenance/fileOpPerfTest.php b/maintenance/fileOpPerfTest.php
index d98cfe3f78..4cb5e10a84 100644
--- a/maintenance/fileOpPerfTest.php
+++ b/maintenance/fileOpPerfTest.php
@@ -55,7 +55,8 @@ class TestFileOpPerformance extends Maintenance {
 
 		$profiler = Profiler::instance();
 		$profiler->setTemplated( true );
-		$profiler->logData(); // prints
+
+		//NOTE: as of MW1.21, $profiler->logData() is called implicitly by doMaintenance.php.
 	}
 
 	protected function doPerfTest( FileBackend $backend ) {