http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97591
Revision: 97591
Author: tstarling
Date: 2011-09-20 01:31:21 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
MFT r97590: fixed ProfilerSimpleUDP total breakage
Modified Paths:
--------------
branches/wmf/1.18wmf1/includes/profiler/ProfilerSimpleUDP.php
Property Changed:
----------------
branches/wmf/1.18wmf1/includes/profiler/
Property changes on: branches/wmf/1.18wmf1/includes/profiler
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/includes/profiler:51646
/branches/new-installer/phase3/includes/profiler:43664-66004
/branches/sqlite/includes/profiler:58211-58321
/branches/wmf-deployment/includes/profiler:53381
/trunk/phase3/includes/profiler:92580,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
Modified: branches/wmf/1.18wmf1/includes/profiler/ProfilerSimpleUDP.php
===================================================================
--- branches/wmf/1.18wmf1/includes/profiler/ProfilerSimpleUDP.php
2011-09-20 01:28:08 UTC (rev 97590)
+++ branches/wmf/1.18wmf1/includes/profiler/ProfilerSimpleUDP.php
2011-09-20 01:31:21 UTC (rev 97591)
@@ -13,7 +13,7 @@
public function logData() {
global $wgUDPProfilerHost, $wgUDPProfilerPort;
- $this->collateData();
+ $this->close();
if ( isset( $this->mCollated['-total'] ) &&
$this->mCollated['-total']['real'] < $this->mMinimumTime ) {
# Less than minimum, ignore
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
