Aaron Schulz has uploaded a new change for review.

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

Change subject: [WIP] Upgrade mismatched begin() warnings to exceptions
......................................................................

[WIP] Upgrade mismatched begin() warnings to exceptions

I saw very few WMF logs for these in the last 7 days.

Change-Id: I79f2f2c8117ffa887a550a793a9e490c2a26f721
---
M includes/db/Database.php
1 file changed, 4 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/260890/1

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 31e2653..d987dd6 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -3474,14 +3474,10 @@
                        } elseif ( !$this->mTrxAutomatic ) {
                                // We want to warn about inadvertently nested 
begin/commit pairs, but not about
                                // auto-committing implicit transactions that 
were started by query() via DBO_TRX
-                               $msg = "$fname: Transaction already in progress 
(from {$this->mTrxFname}), " .
-                                       " performing implicit commit!";
-                               wfWarn( $msg );
-                               wfLogDBError( $msg,
-                                       $this->getLogContext( array(
-                                               'method' => __METHOD__,
-                                               'fname' => $fname,
-                                       ) )
+                               throw new DBUnexpectedError(
+                                       $this,
+                                       "$fname: Transaction already in 
progress (from {$this->mTrxFname}), " .
+                                               " performing implicit commit!"
                                );
                        } else {
                                // if the transaction was automatic and has 
done write operations

-- 
To view, visit https://gerrit.wikimedia.org/r/260890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79f2f2c8117ffa887a550a793a9e490c2a26f721
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>

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

Reply via email to