From 94d1320e8e7aee5529550685023f5ffb85fab212 Mon Sep 17 00:00:00 2001 From: Rafael Souza Date: Thu, 30 May 2013 13:24:57 -0300 Subject: [PATCH] hide "Extras" row if there is nothing to show --- lib/sidekiq/web.rb | 15 ++++++++------- web/views/retry.slim | 9 +++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb index 22b4eedb..820faa02 100644 --- a/lib/sidekiq/web.rb +++ b/lib/sidekiq/web.rb @@ -107,15 +107,16 @@ module Sidekiq args.map { |arg| a = arg.inspect; a.size > count ? "#{a[0..count]}..." : a }.join(", ") end - def display_extra_items(retry_job) - regular_keys = [ - "queue", "class", "args", "retry_count", "retried_at", "failed_at", - "retry", "jid", "error_message", "error_class", "backtrace", "error_backtrace" - ] + RETRY_JOB_KEYS = [ + "queue", "class", "args", "retry_count", "retried_at", "failed_at", + "retry", "jid", "error_message", "error_class", "backtrace", + "error_backtrace", "unique", "enqueued_at" + ] - {}.tap do |extra| + def retry_extra_items(retry_job) + @retry_extra_items ||= {}.tap do |extra| retry_job.item.each do |key, value| - extra[key] = value unless regular_keys.include?(key) + extra[key] = value unless RETRY_JOB_KEYS.include?(key) end end end diff --git a/web/views/retry.slim b/web/views/retry.slim index 011b3979..e119fac8 100644 --- a/web/views/retry.slim +++ b/web/views/retry.slim @@ -19,10 +19,11 @@ table class="retry table table-bordered table-striped" th JID td code= @retry.jid - tr - th = t('Extras') - td - code= display_args(display_extra_items(@retry), 1000) + - unless retry_extra_items(@retry).empty? + tr + th = t('Extras') + td + code= display_args(retry_extra_items(@retry), 1000) - if @retry['retry_count'] > 0 tr th = t('RetryCount')