https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112625
Revision: 112625
Author: ialex
Date: 2012-02-28 18:41:36 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Pass __METHOD__ to DatabaseBase::commit() and DatabaseBase::rollback()
Modified Paths:
--------------
trunk/phase3/maintenance/cleanupImages.php
trunk/phase3/maintenance/deleteSelfExternals.php
trunk/phase3/maintenance/fixSlaveDesync.php
trunk/phase3/maintenance/nukePage.php
trunk/phase3/maintenance/updateSpecialPages.php
Modified: trunk/phase3/maintenance/cleanupImages.php
===================================================================
--- trunk/phase3/maintenance/cleanupImages.php 2012-02-28 18:40:46 UTC (rev
112624)
+++ trunk/phase3/maintenance/cleanupImages.php 2012-02-28 18:41:36 UTC (rev
112625)
@@ -173,7 +173,7 @@
if ( !file_exists( $dir ) ) {
if ( !wfMkdirParents( $dir, null, __METHOD__ )
) {
$this->output( "RENAME FAILED, COULD
NOT CREATE $dir" );
- $db->rollback();
+ $db->rollback( __METHOD__ );
return;
}
}
Modified: trunk/phase3/maintenance/deleteSelfExternals.php
===================================================================
--- trunk/phase3/maintenance/deleteSelfExternals.php 2012-02-28 18:40:46 UTC
(rev 112624)
+++ trunk/phase3/maintenance/deleteSelfExternals.php 2012-02-28 18:41:36 UTC
(rev 112625)
@@ -40,7 +40,7 @@
$db = wfGetDB( DB_MASTER );
while ( 1 ) {
wfWaitForSlaves();
- $db->commit();
+ $db->commit( __METHOD__ );
$q = $db->limitResult( "DELETE /* deleteSelfExternals
*/ FROM externallinks WHERE el_to"
. $db->buildLike( $wgServer . '/',
$db->anyString() ), $this->mBatchSize );
$this->output( "Deleting a batch\n" );
Modified: trunk/phase3/maintenance/fixSlaveDesync.php
===================================================================
--- trunk/phase3/maintenance/fixSlaveDesync.php 2012-02-28 18:40:46 UTC (rev
112624)
+++ trunk/phase3/maintenance/fixSlaveDesync.php 2012-02-28 18:41:36 UTC (rev
112625)
@@ -98,7 +98,7 @@
/*
if ( !$db->masterPosWait( $masterFile, $masterPos, 10 )
) {
$this->output( "Slave is too lagged,
aborting\n" );
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
sleep(10);
return;
}*/
Modified: trunk/phase3/maintenance/nukePage.php
===================================================================
--- trunk/phase3/maintenance/nukePage.php 2012-02-28 18:40:46 UTC (rev
112624)
+++ trunk/phase3/maintenance/nukePage.php 2012-02-28 18:41:36 UTC (rev
112625)
@@ -73,7 +73,7 @@
$this->output( "done.\n" );
}
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
# Delete revisions as appropriate
if ( $delete && $count ) {
Modified: trunk/phase3/maintenance/updateSpecialPages.php
===================================================================
--- trunk/phase3/maintenance/updateSpecialPages.php 2012-02-28 18:40:46 UTC
(rev 112624)
+++ trunk/phase3/maintenance/updateSpecialPages.php 2012-02-28 18:41:36 UTC
(rev 112625)
@@ -128,7 +128,7 @@
$this->output(
"Reconnected\n\n" );
} else {
# Commit the results
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
}
# Wait for the slave to catch up
wfWaitForSlaves();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
