closed-social
/
mastodon
3
0
Fork 2
Code Issues 5 Pull Requests 0 Projects 0 Releases 3 Wiki Activity
Browse Source

Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908) 

Remove locks from scheduled jobs
closed-social-v3
Eugen Rochko 3 years ago
committed by GitHub
parent
33198d8c05
commit
e89e976e92
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 30 additions and 14 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      app/workers/scheduler/backup_cleanup_scheduler.rb
  2. +1
    -1
      app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
  3. +1
    -1
      app/workers/scheduler/email_scheduler.rb
  4. +1
    -1
      app/workers/scheduler/feed_cleanup_scheduler.rb
  5. +1
    -1
      app/workers/scheduler/instance_refresh_scheduler.rb
  6. +1
    -1
      app/workers/scheduler/ip_cleanup_scheduler.rb
  7. +1
    -1
      app/workers/scheduler/media_cleanup_scheduler.rb
  8. +1
    -1
      app/workers/scheduler/pghero_scheduler.rb
  9. +1
    -1
      app/workers/scheduler/scheduled_statuses_scheduler.rb
  10. +1
    -1
      app/workers/scheduler/trending_tags_scheduler.rb
  11. +1
    -1
      app/workers/scheduler/user_cleanup_scheduler.rb
  12. +19
    -3
      config/initializers/sidekiq.rb

+ 1
- 1
app/workers/scheduler/backup_cleanup_scheduler.rb View File

@ -3,7 +3,7 @@
class Scheduler::BackupCleanupScheduler
include Sidekiq::Worker
sidekiq_options lock: :until_executed, retry: 0
sidekiq_options retry: 0
def perform
old_backups.reorder(nil).find_each(&:destroy!)

+ 1
- 1
app/workers/scheduler/doorkeeper_cleanup_scheduler.rb View File

@ -3,7 +3,7 @@
class Scheduler::DoorkeeperCleanupScheduler
include Sidekiq::Worker
sidekiq_options lock: :until_executed, retry: 0
sidekiq_options retry: 0
def perform
Doorkeeper::AccessToken.where('revoked_at IS NOT NULL').where('revoked_at < NOW()').delete_all

+ 1
- 1
app/workers/scheduler/email_scheduler.rb View File

@ -3,7 +3,7 @@
class Scheduler::EmailScheduler
include Sidekiq::Worker
sidekiq_options lock: :until_executed, retry: 0
sidekiq_options retry: 0
FREQUENCY = 7.days.freeze
SIGN_IN_OFFSET = 1.day.freeze

+ 1
- 1
app/workers/scheduler/feed_cleanup_scheduler.rb View File

@ -4,7 +4,7 @@ class Scheduler::FeedCleanupScheduler
include Sidekiq::Worker
include Redisable
sidekiq_options lock: :until_executed, retry: 0
sidekiq_options retry: 0
def perform
clean_home_feeds!

+ 1
- 1
app/workers/scheduler/instance_refresh_scheduler.rb View File

@ -3,7 +3,7 @@
class Scheduler::InstanceRefreshScheduler
include Sidekiq::Worker
sidekiq_options lock: :until_executed, retry: 0
sidekiq_options retry: 0
def perform
Instance.refresh

+ 1
- 1
app/workers/scheduler/ip_cleanup_scheduler.rb View File

@ -5,7 +5,7 @@ class Scheduler::IpCleanupScheduler
IP_RETENTION_PERIOD = 1.year.freeze
sidekiq_options lock: :until_executed, retry: 0
sidekiq_options retry: 0
def perform
clean_ip_columns!

+ 1
- 1
app/workers/scheduler/media_cleanup_scheduler.rb View File

@ -3,7 +3,7 @@
class Scheduler::MediaCleanupScheduler
include Sidekiq::Worker
sidekiq_options lock: :until_executed, retry: 0
sidekiq_options retry: 0
def perform
unattached_media.find_each(&:destroy)

+ 1
- 1
app/workers/scheduler/pghero_scheduler.rb View File

@ -3,7 +3,7 @@
class Scheduler::PgheroScheduler
include Sidekiq::Worker
sidekiq_options lock: :until_executed, retry: 0
sidekiq_options retry: 0
def perform
PgHero.capture_space_stats

+ 1
- 1
app/workers/scheduler/scheduled_statuses_scheduler.rb View File

@ -3,7 +3,7 @@
class Scheduler::ScheduledStatusesScheduler
include Sidekiq::Worker
sidekiq_options lock: :until_executed, retry: 0
sidekiq_options retry: 0
def perform
publish_scheduled_statuses!

+ 1
- 1
app/workers/scheduler/trending_tags_scheduler.rb View File

@ -3,7 +3,7 @@
class Scheduler::TrendingTagsScheduler
include Sidekiq::Worker
sidekiq_options lock: :until_executed, retry: 0
sidekiq_options retry: 0
def perform
TrendingTags.update! if Setting.trends

+ 1
- 1
app/workers/scheduler/user_cleanup_scheduler.rb View File

@ -3,7 +3,7 @@
class Scheduler::UserCleanupScheduler
include Sidekiq::Worker
sidekiq_options lock: :until_executed, retry: 0
sidekiq_options retry: 0
def perform
clean_unconfirmed_accounts!

+ 19
- 3
config/initializers/sidekiq.rb View File

@ -14,14 +14,30 @@ Sidekiq.configure_server do |config|
chain.add SidekiqErrorHandler
end
config.death_handlers << lambda do |job, _ex|
digest = job['lock_digest']
SidekiqUniqueJobs::Digests.delete_by_digest(digest) if digest
config.server_middleware do |chain|
chain.add SidekiqUniqueJobs::Middleware::Server
end
config.client_middleware do |chain|
chain.add SidekiqUniqueJobs::Middleware::Client
end
SidekiqUniqueJobs::Server.configure(config)
end
Sidekiq.configure_client do |config|
config.redis = redis_params
config.client_middleware do |chain|
chain.add SidekiqUniqueJobs::Middleware::Client
end
end
Sidekiq.logger.level = ::Logger.const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)
SidekiqUniqueJobs.configure do |config|
config.reaper = :ruby
config.reaper_count = 1000
config.reaper_interval = 600
config.reaper_timeout = 150
end

Write Preview
Loading…
Cancel
Save