01tonythomas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/169654
Change subject: Handle the return value of getOriginalEmail efficiently
......................................................................
Handle the return value of getOriginalEmail efficiently
This patch:
* Check for the return value of getOriginalEmail before committing into the DB
* make getOriginalEmail() call reuseConnection()
Bug: 69100
Change-Id: I7cd88e6041ff9e64aefb1ec3468f83d88569df64
---
M includes/ProcessBounceEmails.php
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BounceHandler
refs/changes/54/169654/1
diff --git a/includes/ProcessBounceEmails.php b/includes/ProcessBounceEmails.php
index b2c82a8..fb38e7c 100644
--- a/includes/ProcessBounceEmails.php
+++ b/includes/ProcessBounceEmails.php
@@ -97,7 +97,8 @@
&& $currentTime - $bounceTime < $wgVERPAcceptTime ) {
$failedUser['wikiId'] = str_replace( '.', '-',
$hashedVERPPart[1] );
$failedUser['rawUserId'] = base_convert(
$hashedVERPPart[2], 36, 10 );
- $failedUser['rawEmail'] = self::getOriginalEmail(
$failedUser );
+ $failedEmail = self::getOriginalEmail( $failedUser );
+ $failedUser['rawEmail'] = $failedEmail ? : null;
$failedUser['bounceTime'] = $bounceTime;
} else {
wfDebugLog( 'BounceHandler',
@@ -123,14 +124,16 @@
array( 'user_email' ),
array(
'user_id' => $rawUserId,
- ),
+ ),
__METHOD__
- );
+ );
+ wfGetLB( $wikiId )->reuseConnection( $dbr );
if( $res !== false ) {
$rawEmail = $res->user_email;
return $rawEmail;
} else {
wfDebugLog( 'BounceHandler',"Error fetching email_id of
user_id $rawUserId from Database $wikiId." );
+ return false;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/169654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cd88e6041ff9e64aefb1ec3468f83d88569df64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BounceHandler
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
