commit: 6c28886317bdf837e7e3f399115af91ac282735e
parent: 251b04298e826818ecb48c2fdf96a83649e14e93
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 5 Jan 2017 03:28:21 +0100
Improve background jobs params and error handling
Diffstat:
5 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/app/workers/notification_worker.rb b/app/workers/notification_worker.rb
@@ -3,6 +3,8 @@
class NotificationWorker
include Sidekiq::Worker
+ sidekiq_options retry: 5
+
def perform(stream_entry_id, target_account_id)
SendInteractionService.new.call(StreamEntry.find(stream_entry_id), Account.find(target_account_id))
end
diff --git a/app/workers/pubsubhubbub/confirmation_worker.rb b/app/workers/pubsubhubbub/confirmation_worker.rb
@@ -4,7 +4,7 @@ class Pubsubhubbub::ConfirmationWorker
include Sidekiq::Worker
include RoutingHelper
- sidekiq_options queue: 'push'
+ sidekiq_options queue: 'push', retry: false
def perform(subscription_id, mode, secret = nil, lease_seconds = nil)
subscription = Subscription.find(subscription_id)
diff --git a/app/workers/pubsubhubbub/delivery_worker.rb b/app/workers/pubsubhubbub/delivery_worker.rb
@@ -4,7 +4,11 @@ class Pubsubhubbub::DeliveryWorker
include Sidekiq::Worker
include RoutingHelper
- sidekiq_options queue: 'push', retry: 5
+ sidekiq_options queue: 'push', retry: 3, dead: false
+
+ sidekiq_retry_in do |count|
+ 5 * (count + 1)
+ end
def perform(subscription_id, payload)
subscription = Subscription.find(subscription_id)
diff --git a/app/workers/thread_resolve_worker.rb b/app/workers/thread_resolve_worker.rb
@@ -3,6 +3,8 @@
class ThreadResolveWorker
include Sidekiq::Worker
+ sidekiq_options retry: false
+
def perform(child_status_id, parent_url)
child_status = Status.find(child_status_id)
parent_status = FetchRemoteStatusService.new.call(parent_url)
diff --git a/app/workers/unfavourite_worker.rb b/app/workers/unfavourite_worker.rb
@@ -5,5 +5,7 @@ class UnfavouriteWorker
def perform(account_id, status_id)
UnfavouriteService.new.call(Account.find(account_id), Status.find(status_id))
+ rescue ActiveRecord::RecordNotFound
+ true
end
end