From 0b91f622a3680bc8bee1aabe2db6a4da9d62fe2e Mon Sep 17 00:00:00 2001 From: Bryan Davis Date: Mon, 17 Nov 2014 10:32:45 -0700 Subject: [PATCH] Prettier wfLogProfilingData() log message Make the profiler logging output introduced in Iae11e1e a little nicer. Stop adding the Profiler::getRawData() information and add the URL and textual report to the default log message. When testing with a Monolog logger and Logstash the getRawData output from the Xhprof profiler was found to be too big to be usable. The default message output was found to be less informative than desirable when a PSR-3 logger other than MWLoggerLegacyLogger was used. MWLoggerLegacyLogger implements special backwards compatible formatting for the profileoutput channel that will not be effected by this change. Change-Id: Id326aed4f72a3489fac30661c101ac3bb3af2530 --- includes/GlobalFunctions.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index b499904316..71c3791749 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -1226,10 +1226,9 @@ function wfLogProfilingData() { } $ctx['output'] = $profiler->getOutput(); - $ctx['profile'] = $profiler->getRawData(); $log = MWLogger::getInstance( 'profileoutput' ); - $log->info( 'Elapsed: {elapsed}', $ctx ); + $log->info( "Elapsed: {elapsed}; URL: <{url}>\n{output}", $ctx ); } /** -- 2.20.1