[MediaWiki-commits] [Gerrit] Fix TTMServer elastic config - change (operations/mediawiki-config)

2016-04-07 Thread Gehel (Code Review) 
Gehel has submitted this change and it was merged.

Change subject: Fix TTMServer elastic config
..


Fix TTMServer elastic config

Change-Id: Id54140f2d33f7e6d5b599fb8e7b3b3134a9a4374
---
M wmf-config/CommonSettings.php
1 file changed, 10 insertions(+), 2 deletions(-)

Approvals:
  Gehel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 9d2b734..80b671a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2343,11 +2343,19 @@
$wgTranslateDocumentationLanguageCode = 'qqq';
$wgExtraLanguageNames['qqq'] = 'Message documentation'; # No linguistic 
content. Used for documenting messages
 
+   // TODO: proper integration with new CirrusSearch config
+   $wgTranslateExtensionDefaultCluster = 'eqiad';
$wgTranslateTranslationServices = array();
if ( $wmgUseTranslationMemory ) {
$servers = array_map(
-   function ( $v ) { return array( 'host' => $v ); },
-   $wgCirrusSearchClusters[$wgCirrusSearchDefaultCluster]
+   function ( $v ) {
+   if ( is_array( $v ) ) {
+   return array( 'host' => $v['host'] );
+   } else {
+   return array( 'host' => $v );
+   }
+   },
+   
$wgCirrusSearchClusters[$wgTranslateExtensionDefaultCluster]
);
// Read only until renamed to 'TTMServer'
$wgTranslateTranslationServices['TTMServer'] = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id54140f2d33f7e6d5b599fb8e7b3b3134a9a4374
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix TTMServer elastic config - change (operations/mediawiki-config)

2016-04-07 Thread DCausse (Code Review) 
DCausse has uploaded a new change for review.

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

Change subject: Fix TTMServer elastic config
..

Fix TTMServer elastic config

Change-Id: Id54140f2d33f7e6d5b599fb8e7b3b3134a9a4374
---
M wmf-config/CommonSettings.php
1 file changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/53/282153/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 9d2b734..80b671a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2343,11 +2343,19 @@
$wgTranslateDocumentationLanguageCode = 'qqq';
$wgExtraLanguageNames['qqq'] = 'Message documentation'; # No linguistic 
content. Used for documenting messages
 
+   // TODO: proper integration with new CirrusSearch config
+   $wgTranslateExtensionDefaultCluster = 'eqiad';
$wgTranslateTranslationServices = array();
if ( $wmgUseTranslationMemory ) {
$servers = array_map(
-   function ( $v ) { return array( 'host' => $v ); },
-   $wgCirrusSearchClusters[$wgCirrusSearchDefaultCluster]
+   function ( $v ) {
+   if ( is_array( $v ) ) {
+   return array( 'host' => $v['host'] );
+   } else {
+   return array( 'host' => $v );
+   }
+   },
+   
$wgCirrusSearchClusters[$wgTranslateExtensionDefaultCluster]
);
// Read only until renamed to 'TTMServer'
$wgTranslateTranslationServices['TTMServer'] = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id54140f2d33f7e6d5b599fb8e7b3b3134a9a4374
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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