Have enqueued_at time be nil for jobs that have yet to be enqueued (i…

….e., are scheduled).
hanchang · Aug 16, 2015 · e953794 · e953794
1 parent 7fb504a
commit e953794
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/lib/sidekiq/api.rb b/lib/sidekiq/api.rb
@@ -312,7 +312,7 @@ def jid
     end
 
     def enqueued_at
-      Time.at(@item['enqueued_at'] || 0).utc
+      @item['enqueued_at'] ? Time.at(@item['enqueued_at']).utc : nil
     end
 
     def created_at

diff --git a/test/test_api.rb b/test/test_api.rb
@@ -207,6 +207,12 @@ class ApiWorker
       assert_equal 0, q.size
     end
 
+    it 'has no enqueued_at time for jobs enqueued in the future' do
+      job_id = ApiWorker.perform_in(100, 1, 'foo')
+      job = Sidekiq::ScheduledSet.new.find_job(job_id)
+      assert_nil job.enqueued_at
+    end
+
     it 'unwraps delayed jobs' do
       ApiWorker.delay.foo(1,2,3)
       q = Sidekiq::Queue.new

diff --git a/web/locales/en.yml b/web/locales/en.yml
@@ -74,3 +74,4 @@ en: # <---- change this to your locale code
   QuietAll: Quiet All
   PollingInterval: Polling interval
   Plugins: Plugins
+  NotYetEnqueued: Not yet enqueued
diff --git a/web/views/_job_info.erb b/web/views/_job_info.erb
@@ -34,7 +34,7 @@
       </tr>
       <tr>
         <th><%= t('Enqueued') %></th>
-        <td><%= relative_time(job.enqueued_at) %></td>
+        <td><%= (enqueued_at = job.enqueued_at) ? relative_time(enqueued_at) : t('NotYetEnqueued') %></td>
       </tr>
       <% unless retry_extra_items(job).empty? %>
         <tr>