gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix to avoid fetch_instance_info_worker if http 404 returned

Browse source
This commit is contained in:
KMY 2023-08-23 11:50:32 +09:00
parent 3882f22c5e
commit c116fe681f
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/workers/activitypub/fetch_instance_info_worker.rb
View file

@ -6,9 +6,12 @@ class ActivityPub::FetchInstanceInfoWorker
include Redisable include Redisable
include Lockable include Lockable
sidekiq_options queue: 'push', retry: 2
class Error < StandardError; end class Error < StandardError; end
class GoneError < Error; end class GoneError < Error; end
class RequestError < Error; end class RequestError < Error; end
class DeadError < Error; end
SUPPORTED_NOTEINFO_RELS = ['http://nodeinfo.diaspora.software/ns/schema/2.0', 'http://nodeinfo.diaspora.software/ns/schema/2.1'].freeze SUPPORTED_NOTEINFO_RELS = ['http://nodeinfo.diaspora.software/ns/schema/2.0', 'http://nodeinfo.diaspora.software/ns/schema/2.1'].freeze
@ -22,6 +25,8 @@ class ActivityPub::FetchInstanceInfoWorker
update_info!(link) update_info!(link)
end end
rescue ActivityPub::FetchInstanceInfoWorker::DeadError
true
end end
private private
@ -65,6 +70,8 @@ class ActivityPub::FetchInstanceInfoWorker
body_to_json(response.body_with_limit) body_to_json(response.body_with_limit)
elsif response.code == 410 elsif response.code == 410
raise ActivityPub::FetchInstanceInfoWorker::GoneError, "#{@instance.domain} is gone from the server" raise ActivityPub::FetchInstanceInfoWorker::GoneError, "#{@instance.domain} is gone from the server"
elsif response.code == 404
raise ActivityPub::FetchInstanceInfoWorker::DeadError, "Request for #{@instance.domain} returned HTTP #{response.code}"
else else
raise ActivityPub::FetchInstanceInfoWorker::RequestError, "Request for #{@instance.domain} returned HTTP #{response.code}" raise ActivityPub::FetchInstanceInfoWorker::RequestError, "Request for #{@instance.domain} returned HTTP #{response.code}"
end end