jenkins-bot has submitted this change and it was merged.
Change subject: Use __METHOD__ for DB begin/commit calls
......................................................................
Use __METHOD__ for DB begin/commit calls
Change-Id: Ie7dd6b41899f29c2b9f393a5868951125ba5a22f
---
M includes/BoardMover.php
M includes/SubmissionHandler.php
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/BoardMover.php b/includes/BoardMover.php
index 6c1ee9d..f475c07 100644
--- a/includes/BoardMover.php
+++ b/includes/BoardMover.php
@@ -61,7 +61,7 @@
// Open a transaction, this will be closed from self::commit.
$this->dbw = $this->dbFactory->getDB( DB_MASTER );
- $this->dbw->begin();
+ $this->dbw->begin( __METHOD__ );
$this->cache->begin();
// @todo this loads every topic workflow this board has ever
seen,
@@ -118,10 +118,10 @@
}
try {
- $this->dbw->commit();
+ $this->dbw->commit( __METHOD__ );
$this->cache->commit();
} catch ( \Exception $e ) {
- $this->dbw->rollback();
+ $this->dbw->rollback( __METHOD__ );
$this->cache->rollback();
throw $e;
}
diff --git a/includes/SubmissionHandler.php b/includes/SubmissionHandler.php
index 955a809..9770f20 100644
--- a/includes/SubmissionHandler.php
+++ b/includes/SubmissionHandler.php
@@ -142,13 +142,13 @@
$isNew = $workflow->isNew();
try {
- $dbw->begin();
+ $dbw->begin( __METHOD__ );
$cache->begin();
$results = array();
foreach ( $blocks as $block ) {
$results[$block->getName()] = $block->commit();
}
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
// Now commit to cache. If this fails, cache keys
should have been
// invalidated, but still log the failure.
--
To view, visit https://gerrit.wikimedia.org/r/261736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7dd6b41899f29c2b9f393a5868951125ba5a22f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
