From f4ebbbdc9528e01290b68189b0b807cc38b87baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20Keskk=C3=BCla?= Date: Wed, 12 Nov 2014 18:31:21 +0200 Subject: [PATCH] Basic delayed jobs queue display and rubocop fixes --- .../admin/delayed_jobs_controller.rb | 5 ++++ app/views/admin/delayed_jobs/index.haml | 24 +++++++++++++++++++ app/views/layouts/application.haml | 4 ++++ config/deploy.rb | 4 ++-- config/routes.rb | 4 +--- 5 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 app/controllers/admin/delayed_jobs_controller.rb create mode 100644 app/views/admin/delayed_jobs/index.haml diff --git a/app/controllers/admin/delayed_jobs_controller.rb b/app/controllers/admin/delayed_jobs_controller.rb new file mode 100644 index 000000000..88e5b9afe --- /dev/null +++ b/app/controllers/admin/delayed_jobs_controller.rb @@ -0,0 +1,5 @@ +class Admin::DelayedJobsController < AdminController + def index + @jobs = Delayed::Job.all + end +end diff --git a/app/views/admin/delayed_jobs/index.haml b/app/views/admin/delayed_jobs/index.haml new file mode 100644 index 000000000..4b64f07df --- /dev/null +++ b/app/views/admin/delayed_jobs/index.haml @@ -0,0 +1,24 @@ +.row + .col-sm-12 + %h2.text-center-xs= t('shared.jobs') + +%hr +.row + .col-md-12 + .table-responsive + %table.table.table-hover.table-bordered.table-condensed + %thead + %tr + %th{class: 'col-xs-2'}= t('shared.priority') + %th{class: 'col-xs-2'}= t('shared.attempts') + %th{class: 'col-xs-2'}= t('shared.last_error') + %th{class: 'col-xs-1'}= t('shared.run_at') + %th{class: 'col-xs-1'}= t('shared.created_at') + %tbody + - @jobs.each do |job| + %tr + %td= job.priority + %td= job.attempts + %td= job.last_error + %td= job.run_at + %td= job.created_at diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml index 4125f020b..0e5afdfa4 100644 --- a/app/views/layouts/application.haml +++ b/app/views/layouts/application.haml @@ -47,6 +47,10 @@ %li = link_to t('shared.domains_history'), admin_domain_versions_path + %li + = link_to t('shared.jobs'), admin_delayed_jobs_path + + %ul.nav.navbar-nav.navbar-right %li= link_to t('shared.log_out', user: current_user), '/logout' / /.nav-collapse diff --git a/config/deploy.rb b/config/deploy.rb index ff41709c6..adc61258d 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -85,8 +85,8 @@ task deploy: :environment do to :launch do queue "mkdir -p #{deploy_to}/current/tmp; touch #{deploy_to}/current/tmp/restart.txt" - queue "RAILS_ENV=production bin/delayed_job stop" - queue "RAILS_ENV=production bin/delayed_job start" + queue 'RAILS_ENV=production bin/delayed_job stop' + queue 'RAILS_ENV=production bin/delayed_job start' end end end diff --git a/config/routes.rb b/config/routes.rb index b381b856d..3d7608d55 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -27,11 +27,9 @@ Rails.application.routes.draw do resources :users resources :epp_users - resources :contact_versions resources :domain_versions - resources :contact_histories - resources :domain_histories + resources :delayed_jobs root 'domains#index'