gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into kb_development

Browse source
This commit is contained in:
KMY 2023-10-03 20:42:23 +09:00
commit 9e91c1e653
51 changed files with 334 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/workers/account_deletion_worker.rb
View file

@ -3,7 +3,7 @@
class AccountDeletionWorker
include Sidekiq::Worker
sidekiq_options queue: 'pull', lock: :until_executed
sidekiq_options queue: 'pull', lock: :until_executed, lock_ttl: 1.week.to_i
def perform(account_id, options = {})
account = Account.find(account_id)

2
app/workers/activitypub/synchronize_featured_collection_worker.rb
View file

@ -3,7 +3,7 @@
class ActivityPub::SynchronizeFeaturedCollectionWorker
include Sidekiq::Worker
sidekiq_options queue: 'pull', lock: :until_executed
sidekiq_options queue: 'pull', lock: :until_executed, lock_ttl: 1.day.to_i
def perform(account_id, options = {})
options = { note: true, hashtag: false }.deep_merge(options.deep_symbolize_keys)

2
app/workers/activitypub/synchronize_featured_tags_collection_worker.rb
View file

@ -3,7 +3,7 @@
class ActivityPub::SynchronizeFeaturedTagsCollectionWorker
include Sidekiq::Worker
sidekiq_options queue: 'pull', lock: :until_executed
sidekiq_options queue: 'pull', lock: :until_executed, lock_ttl: 1.day.to_i
def perform(account_id, url)
ActivityPub::FetchFeaturedTagsCollectionService.new.call(Account.find(account_id), url)

2
app/workers/activitypub/update_distribution_worker.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
class ActivityPub::UpdateDistributionWorker < ActivityPub::RawDistributionWorker
sidekiq_options queue: 'push', lock: :until_executed
sidekiq_options queue: 'push', lock: :until_executed, lock_ttl: 1.day.to_i
# Distribute an profile update to servers that might have a copy
# of the account in question

2
app/workers/admin/account_deletion_worker.rb
View file

@ -3,7 +3,7 @@
class Admin::AccountDeletionWorker
include Sidekiq::Worker
sidekiq_options queue: 'pull', lock: :until_executed
sidekiq_options queue: 'pull', lock: :until_executed, lock_ttl: 1.week.to_i
def perform(account_id)
DeleteAccountService.new.call(Account.find(account_id), reserve_username: true, reserve_email: true)

2
app/workers/admin/domain_purge_worker.rb
View file

@ -3,7 +3,7 @@
class Admin::DomainPurgeWorker
include Sidekiq::Worker
sidekiq_options queue: 'pull', lock: :until_executed
sidekiq_options queue: 'pull', lock: :until_executed, lock_ttl: 1.week.to_i
def perform(domain)
PurgeDomainService.new.call(domain)

2
app/workers/import/row_worker.rb
View file

@ -8,7 +8,7 @@ class Import::RowWorker
sidekiq_retries_exhausted do |msg, _exception|
ActiveRecord::Base.connection_pool.with_connection do
# Increment the total number of processed items, and bump the state of the import if needed
bulk_import_id = BulkImportRow.where(id: msg['args'][0]).pick(:id)
bulk_import_id = BulkImportRow.where(id: msg['args'][0]).pick(:bulk_import_id)
BulkImport.progress!(bulk_import_id) unless bulk_import_id.nil?
end
end

2
app/workers/publish_scheduled_status_worker.rb
View file

@ -3,7 +3,7 @@
class PublishScheduledStatusWorker
include Sidekiq::Worker
sidekiq_options lock: :until_executed
sidekiq_options lock: :until_executed, lock_ttl: 1.hour.to_i
def perform(scheduled_status_id)
scheduled_status = ScheduledStatus.find(scheduled_status_id)

2
app/workers/resolve_account_worker.rb
View file

@ -3,7 +3,7 @@
class ResolveAccountWorker
include Sidekiq::Worker
sidekiq_options queue: 'pull', lock: :until_executed
sidekiq_options queue: 'pull', lock: :until_executed, lock_ttl: 1.day.to_i
def perform(uri)
ResolveAccountService.new.call(uri)

2
app/workers/scheduler/indexing_scheduler.rb
View file

@ -5,7 +5,7 @@ class Scheduler::IndexingScheduler
include Redisable
include DatabaseHelper
sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 30.minutes.to_i
IMPORT_BATCH_SIZE = 1000
SCAN_BATCH_SIZE = 10 * IMPORT_BATCH_SIZE

2
app/workers/scheduler/scheduled_statuses_scheduler.rb
View file

@ -3,7 +3,7 @@
class Scheduler::ScheduledStatusesScheduler
include Sidekiq::Worker
sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.hour.to_i
def perform
publish_scheduled_statuses!

2
app/workers/scheduler/trends/refresh_scheduler.rb
View file

@ -3,7 +3,7 @@
class Scheduler::Trends::RefreshScheduler
include Sidekiq::Worker
sidekiq_options retry: 0
sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 30.minutes.to_i
def perform
Trends.refresh!

2
app/workers/verify_account_links_worker.rb
View file

@ -3,7 +3,7 @@
class VerifyAccountLinksWorker
include Sidekiq::Worker
sidekiq_options queue: 'default', retry: false, lock: :until_executed
sidekiq_options queue: 'default', retry: false, lock: :until_executed, lock_ttl: 1.hour.to_i
def perform(account_id)
account = Account.find(account_id)