diff options
| author | Surinna Curtis <ekiru.0@gmail.com> | 2017-11-16 01:38:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 01:38:26 -0600 |
| commit | ee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (patch) | |
| tree | fcd9bdb5ba49ab7a6a79590c74db858ae77b4239 /app/workers | |
| parent | 88627fd7aa2493a6890d60a5965459e4c7fe6fe9 (diff) | |
| parent | 35fbdc36f92b610e8a73e2acb220e87cf5fc83b0 (diff) | |
Merge pull request #216 from glitch-soc/merge-upstream-3023725
Merge upstream at commit 3023725
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/admin/suspension_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/thread_resolve_worker.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/workers/admin/suspension_worker.rb b/app/workers/admin/suspension_worker.rb index 6338b1130..e41465ccc 100644 --- a/app/workers/admin/suspension_worker.rb +++ b/app/workers/admin/suspension_worker.rb @@ -6,6 +6,6 @@ class Admin::SuspensionWorker sidekiq_options queue: 'pull' def perform(account_id, remove_user = false) - SuspendAccountService.new.call(Account.find(account_id), remove_user) + SuspendAccountService.new.call(Account.find(account_id), remove_user: remove_user) end end diff --git a/app/workers/thread_resolve_worker.rb b/app/workers/thread_resolve_worker.rb index 38287e8e6..c18a778d5 100644 --- a/app/workers/thread_resolve_worker.rb +++ b/app/workers/thread_resolve_worker.rb @@ -3,7 +3,11 @@ class ThreadResolveWorker include Sidekiq::Worker - sidekiq_options queue: 'pull', retry: false + sidekiq_options queue: 'pull', retry: 3 + + sidekiq_retry_in do |count| + 15 + 10 * (count**4) + rand(10 * (count**4)) + end def perform(child_status_id, parent_url) child_status = Status.find(child_status_id) |