http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96553
Revision: 96553
Author: reedy
Date: 2011-09-08 11:08:35 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
MFT r93682, r93683, r93851
Modified Paths:
--------------
branches/REL1_18/phase3/includes/Article.php
branches/REL1_18/phase3/includes/db/LoadBalancer.php
Property Changed:
----------------
branches/REL1_18/phase3/includes/db/LoadBalancer.php
Modified: branches/REL1_18/phase3/includes/Article.php
===================================================================
--- branches/REL1_18/phase3/includes/Article.php 2011-09-08 10:53:51 UTC
(rev 96552)
+++ branches/REL1_18/phase3/includes/Article.php 2011-09-08 11:08:35 UTC
(rev 96553)
@@ -1765,6 +1765,7 @@
global $wgEnableParserCache, $wgUser;
$user = is_null( $user ) ? $wgUser : $user;
+ wfProfileIn( __METHOD__ );
// Should the parser cache be used?
$useParserCache = $wgEnableParserCache &&
$user->getStubThreshold() == 0 &&
@@ -1780,6 +1781,7 @@
if ( $useParserCache ) {
$parserOutput = ParserCache::singleton()->get( $this,
$this->mPage->getParserOptions() );
if ( $parserOutput !== false ) {
+ wfProfileOut( __METHOD__ );
return $parserOutput;
}
}
@@ -1790,11 +1792,13 @@
} else {
$rev = Revision::newFromTitle( $this->getTitle(),
$oldid );
if ( $rev === null ) {
+ wfProfileOut( __METHOD__ );
return false;
}
$text = $rev->getText();
}
+ wfProfileOut( __METHOD__ );
return $this->getOutputFromWikitext( $text, $useParserCache );
}
Modified: branches/REL1_18/phase3/includes/db/LoadBalancer.php
===================================================================
--- branches/REL1_18/phase3/includes/db/LoadBalancer.php 2011-09-08
10:53:51 UTC (rev 96552)
+++ branches/REL1_18/phase3/includes/db/LoadBalancer.php 2011-09-08
11:08:35 UTC (rev 96553)
@@ -707,7 +707,7 @@
if ( !is_object( $conn ) ) {
// No last connection, probably due to all servers
being too busy
- wfLogDBError( "LB failure with no last connection\n" );
+ wfLogDBError( "LB failure with no last connection.
Connection error: {$this->mLastError}\n" );
$conn = new Database;
// If all servers were busy, mLastError will contain
something sensible
throw new DBConnectionError( $conn, $this->mLastError );
Property changes on: branches/REL1_18/phase3/includes/db/LoadBalancer.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/db/LoadBalancer.php:51646
/branches/new-installer/phase3/includes/db/LoadBalancer.php:43664-66004
/branches/sqlite/includes/db/LoadBalancer.php:58211-58321
/branches/wmf/1.17wmf1/includes/db/LoadBalancer.php:83555
/branches/wmf-deployment/includes/db/LoadBalancer.php:53381
/trunk/phase3/includes/db/LoadBalancer.php:92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93818-93822,93847,93858,93891,93935-93936,94068,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94728,94825,94862,94995-94997,95562,95570,95597,95608,95647-95648,95674,95790,95999,96087
+ /branches/REL1_15/phase3/includes/db/LoadBalancer.php:51646
/branches/new-installer/phase3/includes/db/LoadBalancer.php:43664-66004
/branches/sqlite/includes/db/LoadBalancer.php:58211-58321
/branches/wmf/1.17wmf1/includes/db/LoadBalancer.php:83555
/branches/wmf-deployment/includes/db/LoadBalancer.php:53381
/trunk/phase3/includes/db/LoadBalancer.php:92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93682-93683,93818-93822,93847,93851,93858,93891,93935-93936,94068,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94728,94825,94862,94995-94997,95562,95570,95597,95608,95647-95648,95674,95790,95999,96087
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
