Restoring old async behaviour of thread resolving as it proved to be more robust

rebase/4.0.0rc2
Eugen Rochko 2016-12-12 21:12:19 +01:00
parent 908fcf83c6
commit 668013265c
3 changed files with 17 additions and 13 deletions

View File

@ -122,7 +122,7 @@ class ProcessFeedService < BaseService
def find_or_resolve_status(parent, uri, url)
status = find_status(uri)
ResolveThread.new.call(parent, url) if status.nil?
ThreadResolveWorker.perform_async(parent.id, url) if status.nil?
status
end
@ -243,15 +243,4 @@ class ProcessFeedService < BaseService
"#{username}@#{domain}"
end
end
class ResolveThread
def call(child_status, parent_url)
parent_status = FetchRemoteStatusService.new.call(parent_url)
return if parent_status.nil?
child_status.thread = parent_status
child_status.save!
end
end
end

View File

@ -4,7 +4,7 @@ class Pubsubhubbub::DeliveryWorker
include Sidekiq::Worker
include RoutingHelper
sidekiq_options queue: 'push'
sidekiq_options queue: 'push', retry: 5
def perform(subscription_id, payload)
subscription = Subscription.find(subscription_id)

View File

@ -0,0 +1,15 @@
# frozen_string_literal: true
class ThreadResolveWorker
include Sidekiq::Worker
def perform(child_status_id, parent_url)
child_status = Status.find(child_status_id)
parent_status = FetchRemoteStatusService.new.call(parent_url)
return if parent_status.nil?
child_status.thread = parent_status
child_status.save!
end
end