[MediaWiki-commits] [Gerrit] Replace DB begin()/commit() with startAtomic()/endAtomic() a... - change (mediawiki...CloseWikis)

2016-01-22 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/265838

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(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CloseWikis 
refs/changes/38/265838/1

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: newchange
Gerrit-Change-Id: Iea5402d6317311782a750cac95ddaa9d3c70265d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CloseWikis
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Replace DB begin()/commit() with startAtomic()/endAtomic() a... - change (mediawiki...CloseWikis)

2016-01-22 Thread jenkins-bot (Code Review) 
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 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits