From 0ee8b1652b817fc912671c9a1a88dea6f771973a Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 25 Oct 2018 09:22:30 -0700
Subject: [PATCH] Move timing code out of the try/catch in
 doPostOutputShutdown()

Change-Id: Idc24fdaff5bbcb98445cc4dee8c94cc75cd00573
---
 includes/MediaWiki.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 12b6638070..00caca97ad 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -704,11 +704,12 @@ class MediaWiki {
 	 * @since 1.26
 	 */
 	public function doPostOutputShutdown( $mode = 'normal' ) {
+		// Record backend request timing
+		$timing = $this->context->getTiming();
+		$timing->mark( 'requestShutdown' );
+
 		// Perform the last synchronous operations...
 		try {
-			// Record backend request timing
-			$timing = $this->context->getTiming();
-			$timing->mark( 'requestShutdown' );
 			// Show visible profiling data if enabled (which cannot be post-send)
 			Profiler::instance()->logDataPageOutputOnly();
 		} catch ( Exception $e ) {
-- 
2.20.1