Skip full text search if failed #9654
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Gargron
requested changes
Dec 29, 2018
app/services/search_service.rb
Outdated
| results[:hashtags] = perform_hashtags_search! if hashtag_searchable? | ||
| begin | ||
| results[:statuses] = perform_statuses_search! if full_text_searchable? | ||
| rescue Faraday::ConnectionFailed |
There was a problem hiding this comment.
I think it would be more elegant to just add a rescue block to the perform_statuses_search! method
Gargron
requested changes
Dec 29, 2018
app/services/search_service.rb
Outdated
| @@ -62,7 +62,12 @@ def url_resource_symbol | |||
|
|
|||
| def full_text_searchable? | |||
There was a problem hiding this comment.
That's not the right method. Also, def/end blocks can have a rescue clause without extra begin/end.
There was a problem hiding this comment.
like this?
def method
do_something
rescue Exception
fallback
end
Gargron
approved these changes
Dec 29, 2018
hiyuki2578
pushed a commit
to ProjectMyosotis/mastodon
that referenced
this pull request
Oct 2, 2019
* Skip full text search if failed * Move rescue block to "perform_statuses_search!"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sometimes, ES server are dead while main server is live.
We should give general search results(accounts, hashtags) even if ES server is dead.