Commit 1047dc3a authored by Stan Hu's avatar Stan Hu

Merge branch 'es_fix_path' into 'master'

ES: Fix. bin/elastic_repo_indexer follows config

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/390

See merge request !276
parents c0337aa7 78caba0d
...@@ -14,9 +14,8 @@ TO_SHA = ENV['TO_SHA'] ...@@ -14,9 +14,8 @@ TO_SHA = ENV['TO_SHA']
RAILS_ENV = ENV['RAILS_ENV'] RAILS_ENV = ENV['RAILS_ENV']
elastic_connection_info = JSON.parse ENV['ELASTIC_CONNECTION_INFO'] elastic_connection_info = JSON.parse ENV['ELASTIC_CONNECTION_INFO']
ELASTIC_HOST = elastic_connection_info[:host] ELASTIC_HOST = elastic_connection_info['host']
ELASTIC_PORT = elastic_connection_info[:port] ELASTIC_PORT = elastic_connection_info['port']
class Repository class Repository
include Elasticsearch::Git::Repository include Elasticsearch::Git::Repository
...@@ -28,6 +27,10 @@ class Repository ...@@ -28,6 +27,10 @@ class Repository
port: ELASTIC_PORT port: ELASTIC_PORT
) )
def client_for_indexing
self.__elasticsearch__.client
end
def repository_id def repository_id
PROJECT_ID PROJECT_ID
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment