jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jobs: show retried jobs in /jobs listing.

Browse Source 
Fix the /jobs listing to show retried jobs. GoodJob::ActiveJobJob has a
default scope that filters out retried jobs; remove it in the index
controller so we can see retried jobs.

Also fix mail delivery jobs not showing up in the dropdown in the /jobs
search form.
This commit is contained in:
evazion
2022-01-04 17:44:55 -06:00
parent f38910f0a2
commit dc159ed135
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/jobs_controller.rb
View File

@@ -4,7 +4,7 @@ class JobsController < ApplicationController
respond_to :html, :xml, :json, :js respond_to :html, :xml, :json, :js
def index def index
@jobs = authorize BackgroundJob.paginated_search(params) @jobs = authorize BackgroundJob.unscoped.paginated_search(params)
respond_with(@jobs) respond_with(@jobs)
end end

2
app/jobs/application_job.rb
View File

@@ -35,7 +35,7 @@ class ApplicationJob < ActiveJob::Base
RegeneratePostJob, RetireTagRelationshipsJob, RegeneratePostJob, RetireTagRelationshipsJob,
UploadPreprocessorDelayedStartJob, UploadServiceDelayedStartJob, UploadPreprocessorDelayedStartJob, UploadServiceDelayedStartJob,
VacuumDatabaseJob, DiscordNotificationJob, BigqueryExportJob, VacuumDatabaseJob, DiscordNotificationJob, BigqueryExportJob,
ProcessBulkUpdateRequestJob, PruneJobsJob ProcessBulkUpdateRequestJob, PruneJobsJob, ActionMailer::MailDeliveryJob
] ]
end end
end end

2
app/models/background_job.rb
View File

@@ -27,7 +27,7 @@ class BackgroundJob < GoodJob::ActiveJobJob
end end
def name_matches(name) def name_matches(name)
class_name = name.tr(" ", "_").camelize + "Job" class_name = name.tr(" ", "_").classify + "Job"
where_json_contains(:serialized_params, { job_class: class_name }) where_json_contains(:serialized_params, { job_class: class_name })
end end