jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334390 )
Change subject: Avoid calling bogus LBFactory::destroyInstance() method
......................................................................
Avoid calling bogus LBFactory::destroyInstance() method
Change-Id: I0adb82b78fa69029c523aaaf7b3c915758b6a071
---
M Maintenance_body.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Maintenance_body.php b/Maintenance_body.php
index 61f3248..ccf232c 100644
--- a/Maintenance_body.php
+++ b/Maintenance_body.php
@@ -4,6 +4,8 @@
die( 1 );
}
+use MediaWiki\MediaWikiServices;
+
class SpecialMaintenance extends SpecialPage {
private $type = '';
private $metadata = array();
@@ -633,7 +635,7 @@
$wgDBpasswordold = $wgDBpassword;
$wgDBuser = $wgDBadminuser;
$wgDBpassword = $wgDBadminpassword;
- LBFactory::destroyInstance();
+
}
}
@@ -646,7 +648,7 @@
$wgDBuser = $wgDBuserold;
$wgDBpassword = $wgDBpasswordold;
unset( $GLOBALS['wgDBuserold'],
$GLOBALS['wgDBpasswordold'] );
- LBFactory::destroyInstance();
+
MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->destroy();
}
$goptions = $this->metadata[$this->type]['option'];
--
To view, visit https://gerrit.wikimedia.org/r/334390
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0adb82b78fa69029c523aaaf7b3c915758b6a071
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Maintenance
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
