Merge "[LockManager] Split QuorumLockManager into its own file."

diff --git a/includes/Exception.php b/includes/Exception.php
index 0499b32..4cb946c 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -573,7 +573,7 @@ class HttpError extends MWException {
         * @return int
         */
        public function getStatusCode() {
-               $this->httpCode;
+               return $this->httpCode;
        }
 
        /**

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 2bb2a0f..c6768bd 100644 (file)
--- 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 d98cfe3..4cb5e10 100644 (file)
--- 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 ) {