jenkins-bot has submitted this change and it was merged.
Change subject: Replace DB begin()/commit() with startAtomic()/endAtomic() as
needed
......................................................................
Replace DB begin()/commit() with startAtomic()/endAtomic() as needed
Bug: T120791
Change-Id: Iea5402d6317311782a750cac95ddaa9d3c70265d
---
M CloseWikis.php
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CloseWikis.php b/CloseWikis.php
index 3fb0f62..ed27f52 100644
--- a/CloseWikis.php
+++ b/CloseWikis.php
@@ -150,8 +150,8 @@
*/
static function close( $wiki, $dispreason, $by ) {
global $wgMemc;
- $dbw = CloseWikis::getMasterDB();
- $dbw->begin( __METHOD__ );
+ $dbw = self::getMasterDB();
+ $dbw->startAtomic( __METHOD__ );
$dbw->insert(
'closedwikis',
array(
@@ -164,7 +164,7 @@
array( 'IGNORE' ) // Better error handling
);
$result = (bool)$dbw->affectedRows();
- $dbw->commit( __METHOD__ );
+ $dbw->endAtomic( __METHOD__ );
$wgMemc->delete( "closedwikis:{$wiki}" );
self::$cachedList = null;
return $result;
@@ -174,14 +174,14 @@
static function reopen( $wiki ) {
global $wgMemc;
$dbw = self::getMasterDB();
- $dbw->begin( __METHOD__ );
+ $dbw->startAtomic( __METHOD__ );
$dbw->delete(
'closedwikis',
array( 'cw_wiki' => $wiki ),
__METHOD__
);
$result = (bool)$dbw->affectedRows();
- $dbw->commit( __METHOD__ );
+ $dbw->endAtomic( __METHOD__ );
$wgMemc->delete( "closedwikis:{$wiki}" );
self::$cachedList = null;
return $result;
--
To view, visit https://gerrit.wikimedia.org/r/265838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea5402d6317311782a750cac95ddaa9d3c70265d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CloseWikis
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
