diff options
| author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-03 11:51:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 11:51:35 -0700 |
| commit | de154dbd5dbb04d083f5a66dc288d9fef7006c01 (patch) | |
| tree | 88a1715021c33add55501351dbf74950deeac481 /app/workers | |
| parent | c3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff) | |
| parent | e6657d7342ee1ce08973bf1e5ab89e423eb8b760 (diff) | |
Merge pull request #1 from Gargron/master
Catchup merge
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/processing_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/pubsubhubbub/distribution_worker.rb | 9 | ||||
| -rw-r--r-- | app/workers/salmon_worker.rb | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/app/workers/processing_worker.rb b/app/workers/processing_worker.rb index b31cd0aaf..5df404bcc 100644 --- a/app/workers/processing_worker.rb +++ b/app/workers/processing_worker.rb @@ -2,7 +2,7 @@ class ProcessingWorker include Sidekiq::Worker - + sidekiq_options backtrace: true def perform(account_id, body) diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb index e88d11be0..d5437bf6b 100644 --- a/app/workers/pubsubhubbub/distribution_worker.rb +++ b/app/workers/pubsubhubbub/distribution_worker.rb @@ -7,9 +7,12 @@ class Pubsubhubbub::DistributionWorker def perform(stream_entry_id) stream_entry = StreamEntry.find(stream_entry_id) - account = stream_entry.account - renderer = AccountsController.renderer.new(method: 'get', http_host: Rails.configuration.x.local_domain, https: Rails.configuration.x.use_https) - payload = renderer.render(:show, assigns: { account: account, entries: [stream_entry] }, formats: [:atom]) + + return if stream_entry.hidden? + + account = stream_entry.account + renderer = AccountsController.renderer.new(method: 'get', http_host: Rails.configuration.x.local_domain, https: Rails.configuration.x.use_https) + payload = renderer.render(:show, assigns: { account: account, entries: [stream_entry] }, formats: [:atom]) Subscription.where(account: account).active.select('id').find_each do |subscription| Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload) diff --git a/app/workers/salmon_worker.rb b/app/workers/salmon_worker.rb index 0903ca487..fc95ce47f 100644 --- a/app/workers/salmon_worker.rb +++ b/app/workers/salmon_worker.rb @@ -2,7 +2,7 @@ class SalmonWorker include Sidekiq::Worker - + sidekiq_options backtrace: true def perform(account_id, body) |