Daniel Werner has submitted this change and it was merged.
Change subject: Fix for rare failure in case of no farm members defined
......................................................................
Fix for rare failure in case of no farm members defined
Change-Id: I088569ce8f56ee1a6addee6ed4cf7f51857c2871
---
M includes/SimpleFarm.php
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Daniel Werner: Verified; Looks good to me, approved
diff --git a/includes/SimpleFarm.php b/includes/SimpleFarm.php
index 17fdf57..3e10723 100644
--- a/includes/SimpleFarm.php
+++ b/includes/SimpleFarm.php
@@ -159,10 +159,12 @@
global $egSimpleFarmMainMemberDB, $wgCommandLineMode;
+ $mainMember = self::getMainMember();
+
// set some main member if not set in config and farm has
members:
- if( $egSimpleFarmMainMemberDB === null ) {
- $egSimpleFarmMainMemberDB =
self::getMainMember()->getDB();
- }
+ if( $egSimpleFarmMainMemberDB === null && $mainMember !== null
) {
+ $egSimpleFarmMainMemberDB = $mainMember->getDB();
+ }
// get selected member for this farm call:
$wiki = self::getActiveMember();
--
To view, visit https://gerrit.wikimedia.org/r/89041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I088569ce8f56ee1a6addee6ed4cf7f51857c2871
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SimpleFarm
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner <[email protected]>
Gerrit-Reviewer: Daniel Werner <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
