gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-11-27 18:10:58 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Handle unreachable network error for search services (#36587)

Browse Source
This commit is contained in:
Matt Jankowski 2025-10-27 09:28:56 -04:00 committed by GitHub
parent 38f15a89fe
commit b60bae6361
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/account_search_service.rb
View File

@ -256,7 +256,7 @@ class AccountSearchService < BaseService
ActiveRecord::Associations::Preloader.new(records: records, associations: [:account_stat, { user: :role }]).call
records
rescue Faraday::ConnectionFailed, Parslet::ParseFailed
rescue Faraday::ConnectionFailed, Parslet::ParseFailed, Errno::ENETUNREACH
nil
end

2
app/services/statuses_search_service.rb
View File

@ -32,7 +32,7 @@ class StatusesSearchService < BaseService
preloaded_relations = @account.relations_map(account_ids, account_domains)
results.reject { |status| StatusFilter.new(status, @account, preloaded_relations).filtered? }
rescue Faraday::ConnectionFailed, Parslet::ParseFailed
rescue Faraday::ConnectionFailed, Parslet::ParseFailed, Errno::ENETUNREACH
[]
end

2
app/services/tag_search_service.rb
View File

@ -30,7 +30,7 @@ class TagSearchService < BaseService
definition = definition.filter(elastic_search_filter) if @options[:exclude_unreviewed]
ensure_exact_match(definition.limit(@limit).offset(@offset).objects.compact)
rescue Faraday::ConnectionFailed, Parslet::ParseFailed
rescue Faraday::ConnectionFailed, Parslet::ParseFailed, Errno::ENETUNREACH
nil
end