jenkins-bot has submitted this change and it was merged.
Change subject: Allow full server configuration with array syntax
......................................................................
Allow full server configuration with array syntax
I need to run ES on a non-default port and this change is needed
to allow me to do that with CirrusSearch.
Change-Id: I441e056f4aad68f884eb03f7e1ebdccc5c22e173
---
M ElasticaConnection.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Manybubbles: Looks good to me, approved
Tjones: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/ElasticaConnection.php b/ElasticaConnection.php
index bd3917b..2e05a1f 100644
--- a/ElasticaConnection.php
+++ b/ElasticaConnection.php
@@ -76,7 +76,11 @@
// Setup the Elastica servers
$servers = array();
foreach ( $this->getServerList() as $server ) {
- $servers[] = array( 'host' => $server );
+ if ( is_array( $server ) ) {
+ $servers[] = $server;
+ } else {
+ $servers[] = array( 'host' => $server );
+ }
}
$self = $this;
--
To view, visit https://gerrit.wikimedia.org/r/223392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I441e056f4aad68f884eb03f7e1ebdccc5c22e173
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Elastica
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Manybubbles <never...@wikimedia.org>
Gerrit-Reviewer: Tjones <tjo...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
