Fix Scheduler::SubscriptionsScheduler (#2834)

* Fix Scheduler::SubscriptionsScheduler, add worker test for it

* Change production log level of Sidekiq to "warn" instead of "info"
feature/8296-invite_api
Eugen Rochko 5 years ago committed by GitHub
parent 1f15a15621
commit b8e166894b
  1. 7
      app/workers/application_worker.rb
  2. 4
      app/workers/distribution_worker.rb
  3. 2
      app/workers/pubsubhubbub/confirmation_worker.rb
  4. 2
      app/workers/pubsubhubbub/subscribe_worker.rb
  5. 4
      app/workers/scheduler/subscriptions_scheduler.rb
  6. 1
      config/environments/production.rb
  7. 19
      spec/workers/scheduler/subscriptions_scheduler_spec.rb

@ -1,7 +0,0 @@
# frozen_string_literal: true
class ApplicationWorker
def info(message)
Rails.logger.info("#{self.class.name} - #{message}")
end
end

@ -1,11 +1,11 @@
# frozen_string_literal: true
class DistributionWorker < ApplicationWorker
class DistributionWorker
include Sidekiq::Worker
def perform(status_id)
FanOutOnWriteService.new.call(Status.find(status_id))
rescue ActiveRecord::RecordNotFound
info("Couldn't find the status")
true
end
end

@ -25,7 +25,7 @@ class Pubsubhubbub::ConfirmationWorker
body = response.body.to_s
Rails.logger.debug "Confirming PuSH subscription for #{subscription.callback_url} with challenge #{challenge}: #{body}"
logger.debug "Confirming PuSH subscription for #{subscription.callback_url} with challenge #{challenge}: #{body}"
if mode == 'subscribe' && body == challenge
subscription.save!

@ -7,7 +7,7 @@ class Pubsubhubbub::SubscribeWorker
def perform(account_id)
account = Account.find(account_id)
Rails.logger.debug "PuSH re-subscribing to #{account.acct}"
logger.debug "PuSH re-subscribing to #{account.acct}"
::SubscribeService.new.call(account)
end
end

@ -5,9 +5,9 @@ class Scheduler::SubscriptionsScheduler
include Sidekiq::Worker
def perform
Rails.logger.debug 'Queueing PuSH re-subscriptions'
logger.info 'Queueing PuSH re-subscriptions'
expiring_accounts.pluck(:id) do |id|
expiring_accounts.pluck(:id).each do |id|
Pubsubhubbub::SubscribeWorker.perform_async(id)
end
end

@ -87,6 +87,7 @@ Rails.application.configure do
config.to_prepare do
StatsD.backend = StatsD::Instrument::Backends::NullBackend.new if ENV['STATSD_ADDR'].blank?
Sidekiq::Logging.logger.level = Logger::WARN
end
config.action_dispatch.default_headers = {

@ -0,0 +1,19 @@
require 'rails_helper'
describe Scheduler::SubscriptionsScheduler do
subject { Scheduler::SubscriptionsScheduler.new }
let!(:expiring_account1) { Fabricate(:account, subscription_expires_at: 20.minutes.from_now, domain: 'example.com', followers_count: 1, hub_url: 'http://hub.example.com') }
let!(:expiring_account2) { Fabricate(:account, subscription_expires_at: 4.hours.from_now, domain: 'example.org', followers_count: 1, hub_url: 'http://hub.example.org') }
before do
stub_request(:post, 'http://hub.example.com/').to_return(status: 202)
stub_request(:post, 'http://hub.example.org/').to_return(status: 202)
end
it 're-subscribes for all expiring accounts' do
subject.perform
expect(a_request(:post, 'http://hub.example.com/')).to have_been_made.once
expect(a_request(:post, 'http://hub.example.org/')).to have_been_made.once
end
end
Loading…
Cancel
Save