Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed ES URL ip to loop (#961)

Browse source
This commit is contained in:
Never 2017-04-18 13:35:05 +08:00 committed by André Bauer
parent 449d1904fe
commit b80b1679b6
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/controllers/search_controller_test.rb
View file

@ -163,10 +163,10 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
# configure es # configure es
if ENV['ES_URL'] if ENV['ES_URL']
#fail "ERROR: Need ES_URL - hint ES_URL='http://172.0.0.1:9200'" #fail "ERROR: Need ES_URL - hint ES_URL='http://127.0.0.1:9200'"
Setting.set('es_url', ENV['ES_URL']) Setting.set('es_url', ENV['ES_URL'])
# Setting.set('es_url', 'http://172.0.0.1:9200') # Setting.set('es_url', 'http://127.0.0.1:9200')
# Setting.set('es_index', 'estest.local_zammad') # Setting.set('es_index', 'estest.local_zammad')
# Setting.set('es_user', 'elasticsearch') # Setting.set('es_user', 'elasticsearch')
# Setting.set('es_password', 'zammad') # Setting.set('es_password', 'zammad')

4
test/integration/elasticsearch_test.rb
View file

@ -5,7 +5,7 @@ class ElasticsearchTest < ActiveSupport::TestCase
# set config # set config
if !ENV['ES_URL'] if !ENV['ES_URL']
raise "ERROR: Need ES_URL - hint ES_URL='http://172.0.0.1:9200'" raise "ERROR: Need ES_URL - hint ES_URL='http://127.0.0.1:9200'"
end end
Setting.set('es_url', ENV['ES_URL']) Setting.set('es_url', ENV['ES_URL'])
if !ENV['ES_INDEX'] && !ENV['ES_INDEX_RAND'] if !ENV['ES_INDEX'] && !ENV['ES_INDEX_RAND']
@ -16,7 +16,7 @@ class ElasticsearchTest < ActiveSupport::TestCase
end end
Setting.set('es_index', ENV['ES_INDEX']) Setting.set('es_index', ENV['ES_INDEX'])
# Setting.set('es_url', 'http://172.0.0.1:9200') # Setting.set('es_url', 'http://127.0.0.1:9200')
# Setting.set('es_index', 'estest.local_zammad') # Setting.set('es_index', 'estest.local_zammad')
# Setting.set('es_user', 'elasticsearch') # Setting.set('es_user', 'elasticsearch')
# Setting.set('es_password', 'zammad') # Setting.set('es_password', 'zammad')

4
test/integration/report_test.rb
View file

@ -5,7 +5,7 @@ class ReportTest < ActiveSupport::TestCase
# set config # set config
if !ENV['ES_URL'] if !ENV['ES_URL']
raise "ERROR: Need ES_URL - hint ES_URL='http://172.0.0.1:9200'" raise "ERROR: Need ES_URL - hint ES_URL='http://127.0.0.1:9200'"
end end
Setting.set('es_url', ENV['ES_URL']) Setting.set('es_url', ENV['ES_URL'])
if !ENV['ES_INDEX'] && !ENV['ES_INDEX_RAND'] if !ENV['ES_INDEX'] && !ENV['ES_INDEX_RAND']
@ -16,7 +16,7 @@ class ReportTest < ActiveSupport::TestCase
end end
Setting.set('es_index', ENV['ES_INDEX']) Setting.set('es_index', ENV['ES_INDEX'])
# Setting.set('es_url', 'http://172.0.0.1:9200') # Setting.set('es_url', 'http://127.0.0.1:9200')
# Setting.set('es_index', 'estest.local_zammad') # Setting.set('es_index', 'estest.local_zammad')
# Setting.set('es_user', 'elasticsearch') # Setting.set('es_user', 'elasticsearch')
# Setting.set('es_password', 'zammad') # Setting.set('es_password', 'zammad')