Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add diagnostic message for failure during CLI search deploy #29462

Merged
merged 2 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/mastodon/cli/search.rb
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,14 @@ def deploy
progress.finish

say("Indexed #{added} records, de-indexed #{removed}", :green, true)
rescue Elasticsearch::Transport::Transport::ServerError => e
fail_with_message <<~ERROR
There was an issue connecting to the search server. Make sure the
server is configured and running correctly, and that the environment
variable settings match what the server is expecting.

#{e.message}
ERROR
end

private
Expand Down
11 changes: 11 additions & 0 deletions spec/lib/mastodon/cli/search_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,17 @@
end
end

context 'when server communication raises an error' do
let(:options) { { reset_chewy: true } }

before { allow(Chewy::Stash::Specification).to receive(:reset!).and_raise(Elasticsearch::Transport::Transport::Errors::InternalServerError) }

it 'Exits with error message' do
expect { subject }
.to raise_error(Thor::Error, /issue connecting to the search/)
end
end

context 'without options' do
before { stub_search_indexes }

Expand Down