nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix workaround for Elasticsearch 7.x (#13828)

This commit is contained in:
Takeshi Umeda 2020-05-23 12:48:14 +09:00 committed by GitHub
parent e6706d171a
commit 1c434615b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/initializers/chewy.rb
View File

@ -29,3 +29,22 @@ end
# Mastodon is run with hidden services enabled, because # Mastodon is run with hidden services enabled, because
# ElasticSearch is *not* supposed to be accessed through a proxy # ElasticSearch is *not* supposed to be accessed through a proxy
Faraday.ignore_env_proxy = true Faraday.ignore_env_proxy = true
# Elasticsearch 7.x workaround
Elasticsearch::Transport::Client.prepend Module.new {
def search(arguments = {})
arguments[:rest_total_hits_as_int] = true
super arguments
end
}
Elasticsearch::API::Indices::IndicesClient.prepend Module.new {
def create(arguments = {})
arguments[:include_type_name] = true
super arguments
end
def put_mapping(arguments = {})
arguments[:include_type_name] = true
super arguments
end
}