r97591 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r97590‎ | r97591 | r97592 >
Date:01:31, 20 September 2011
Author:tstarling
Status:ok
Tags:
Comment:
MFT r97590: fixed ProfilerSimpleUDP total breakage
Modified paths:
  • /branches/wmf/1.18wmf1/includes/profiler (modified) (history)
  • /branches/wmf/1.18wmf1/includes/profiler/ProfilerSimpleUDP.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/includes/profiler/ProfilerSimpleUDP.php
——@@ -13,7 +13,7 @@
1414 public function logData() {
1515 global $wgUDPProfilerHost, $wgUDPProfilerPort;
1616
17 - $this->collateData();
 17+ $this->close();
1818
1919 if ( isset( $this->mCollated['-total'] ) && $this->mCollated['-total']['real'] < $this->mMinimumTime ) {
2020 # Less than minimum, ignore
Property changes on: branches/wmf/1.18wmf1/includes/profiler
___________________________________________________________________
Added: svn:mergeinfo
2121 Merged /branches/new-installer/phase3/includes/profiler:r43664-66004
2222 Merged /branches/wmf-deployment/includes/profiler:r53381
2323 Merged /branches/REL1_15/phase3/includes/profiler:r51646
2424 Merged /branches/sqlite/includes/profiler:r58211-58321
2525 Merged /trunk/phase3/includes/profiler:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,97590

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r97590Don't call Profiler::collateData() from ProfilerSimpleUDP, it destroys $this-...tstarling01:28, 20 September 2011

Status & tagging log