Skip to content

Commit

Permalink
Fix ElasticSearch to Elasticsearch (mastodon#17050)
Browse files Browse the repository at this point in the history
  • Loading branch information
noellabo authored and jesseplusplus committed Feb 10, 2022
1 parent a504dfe commit 386fbc6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .env.nanobox
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ DB_PORT=5432

# DATABASE_URL=postgresql://$DATA_DB_USER:$DATA_DB_PASS@$DATA_DB_HOST/gonano

# Optional ElasticSearch configuration
# Optional Elasticsearch configuration
ES_ENABLED=true
ES_HOST=$DATA_ELASTIC_HOST
ES_PORT=9200
Expand Down
2 changes: 1 addition & 1 deletion .env.production.sample
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ DB_NAME=mastodon_production
DB_PASS=
DB_PORT=5432

# ElasticSearch (optional)
# Elasticsearch (optional)
# ------------------------
ES_ENABLED=true
ES_HOST=localhost
Expand Down
6 changes: 3 additions & 3 deletions config/initializers/chewy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

# We use our own async strategy even outside the request-response
# cycle, which takes care of checking if ElasticSearch is enabled
# cycle, which takes care of checking if Elasticsearch is enabled
# or not. However, mind that for the Rails console, the :urgent
# strategy is set automatically with no way to override it.
Chewy.root_strategy = :custom_sidekiq
Expand All @@ -32,8 +32,8 @@ def enabled?
end
end

# ElasticSearch uses Faraday internally. Faraday interprets the
# Elasticsearch uses Faraday internally. Faraday interprets the
# http_proxy env variable by default which leads to issues when
# 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
4 changes: 2 additions & 2 deletions lib/mastodon/search_cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class SearchCLI < Thor
option :concurrency, type: :numeric, default: 2, aliases: [:c], desc: 'Workload will be split between this number of threads'
option :batch_size, type: :numeric, default: 1_000, aliases: [:b], desc: 'Number of records in each batch'
option :only, type: :array, enum: %w(accounts tags statuses), desc: 'Only process these indices'
desc 'deploy', 'Create or upgrade ElasticSearch indices and populate them'
desc 'deploy', 'Create or upgrade Elasticsearch indices and populate them'
long_desc <<~LONG_DESC
If ElasticSearch is empty, this command will create the necessary indices
If Elasticsearch is empty, this command will create the necessary indices
and then import data from the database into those indices.
This command will also upgrade indices if the underlying schema has been
Expand Down

0 comments on commit 386fbc6

Please sign in to comment.