IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Zeitwerk-related fixes for jobs. (#8219)

Browse Source
This commit is contained in:
Dan Ungureanu 2019-10-21 20:25:35 +03:00 committed by GitHub
parent b41b12ad71
commit 1358312584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/jobs/regular/bulk_invite.rb
View File

@ -25,7 +25,7 @@ module Jobs
process_invites(invites) process_invites(invites)
if @total_invites > Invite::BULK_INVITE_EMAIL_LIMIT if @total_invites > Invite::BULK_INVITE_EMAIL_LIMIT
Jobs.enqueue(:process_bulk_invite_emails) ::Jobs.enqueue(:process_bulk_invite_emails)
end end
ensure ensure
notify_user notify_user

2
app/jobs/regular/emit_web_hook_event.rb
View File

@ -93,7 +93,7 @@ module Jobs
@retry_count += 1 @retry_count += 1
return if @retry_count > MAX_RETRY_COUNT return if @retry_count > MAX_RETRY_COUNT
delay = RETRY_BACKOFF**(@retry_count - 1) delay = RETRY_BACKOFF**(@retry_count - 1)
Jobs.enqueue_in(delay.minutes, :emit_web_hook_event, @arguments) ::Jobs.enqueue_in(delay.minutes, :emit_web_hook_event, @arguments)
end end
end end

4
app/jobs/regular/process_bulk_invite_emails.rb
View File

@ -10,9 +10,9 @@ module Jobs
if pending_invite_ids.length > 0 if pending_invite_ids.length > 0
Invite.where(id: pending_invite_ids).update_all(emailed_status: Invite.emailed_status_types[:sending]) Invite.where(id: pending_invite_ids).update_all(emailed_status: Invite.emailed_status_types[:sending])
pending_invite_ids.each do |invite_id| pending_invite_ids.each do |invite_id|
Jobs.enqueue(:invite_email, invite_id: invite_id) ::Jobs.enqueue(:invite_email, invite_id: invite_id)
end end
Jobs.enqueue_in(1.minute, :process_bulk_invite_emails) ::Jobs.enqueue_in(1.minute, :process_bulk_invite_emails)
end end
end end
end end

2
app/jobs/regular/suspicious_login.rb
View File

@ -12,7 +12,7 @@ module Jobs
user_agent: args[:user_agent], user_agent: args[:user_agent],
client_ip: args[:client_ip]) client_ip: args[:client_ip])
Jobs.enqueue(:critical_user_email, ::Jobs.enqueue(:critical_user_email,
type: :suspicious_login, type: :suspicious_login,
user_id: args[:user_id], user_id: args[:user_id],
client_ip: args[:client_ip], client_ip: args[:client_ip],

2
app/jobs/scheduled/activation_reminder_emails.rb
View File

@ -14,7 +14,7 @@ module Jobs
user.save_custom_fields user.save_custom_fields
email_token = user.email_tokens.create!(email: user.email) email_token = user.email_tokens.create!(email: user.email)
Jobs.enqueue(:user_email, ::Jobs.enqueue(:user_email,
type: :activation_reminder, type: :activation_reminder,
user_id: user.id, user_id: user.id,
email_token: email_token.token) email_token: email_token.token)

2
app/jobs/scheduled/enqueue_digest_emails.rb
View File

@ -8,7 +8,7 @@ module Jobs
def execute(args) def execute(args)
return if SiteSetting.disable_digest_emails? || SiteSetting.private_email? return if SiteSetting.disable_digest_emails? || SiteSetting.private_email?
target_user_ids.each do |user_id| target_user_ids.each do |user_id|
Jobs.enqueue(:user_email, type: :digest, user_id: user_id) ::Jobs.enqueue(:user_email, type: :digest, user_id: user_id)
end end
end end

4
app/jobs/scheduled/schedule_backup.rb
View File

@ -14,12 +14,12 @@ module Jobs
return if (date + SiteSetting.backup_frequency.days) > Time.now.utc.to_date return if (date + SiteSetting.backup_frequency.days) > Time.now.utc.to_date
end end
Jobs.cancel_scheduled_job(:create_backup) ::Jobs.cancel_scheduled_job(:create_backup)
time_of_day = Time.parse(SiteSetting.backup_time_of_day) time_of_day = Time.parse(SiteSetting.backup_time_of_day)
seconds = time_of_day.hour.hours + time_of_day.min.minutes + rand(10.minutes) seconds = time_of_day.hour.hours + time_of_day.min.minutes + rand(10.minutes)
Jobs.enqueue_in(seconds, :create_backup) ::Jobs.enqueue_in(seconds, :create_backup)
rescue => e rescue => e
notify_user(e) notify_user(e)
raise raise