Unverified Commit f7e72111 authored by Matt Glaman's avatar Matt Glaman Committed by GitHub
Browse files

Issue #3312897 by nkoporec: Remove references to search_service_colony

parent 36e2f892
Loading
Loading
Loading
Loading
+0 −14
Original line number Diff line number Diff line
@@ -69,20 +69,6 @@ class AcquiaSearchSolrApi extends AcquiaSearchSolrApiBase implements AcquiaSearc
      $subscription = acquia_agent_settings('acquia_subscription_data');
    }
    $search_host = variable_get('acquia_search_v' . self::ACQUIA_SEARCH_VERSION . '_host', 'search.acquia.com');
    // @todo rework this logic once we have AH_SERVER_REGION
    // legacy_internal will be true if 'internal-' is the start of the host
    // name that's set in via Acquia Cloud platform or vset.
    $legacy_internal = preg_match('/internal[-.]/', $search_host);
    // Adding the subscription specific colony to the heartbeat data.
    if (!empty($subscription['heartbeat_data']['search_service_colony'])) {
      $search_host = $subscription['heartbeat_data']['search_service_colony'];
      if ($legacy_internal) {
        // If we want to be using an internal host name, fix the one
        // from the hearbeat data here.
        $search_host = 'internal-' . $search_host;
      }
    }
    // Check if we are on Acquia Cloud hosting. @see NN-2503.
    if (!empty($_ENV['AH_SITE_ENVIRONMENT']) && !empty($_ENV['AH_SERVER_REGION'])) {
      if ($_ENV['AH_SERVER_REGION'] == 'us-east-1' && $search_host == 'search.acquia.com') {
        $search_host = 'internal-search.acquia.com';