mirror of
https://github.com/mperham/sidekiq.git
synced 2022-11-09 13:52:34 -05:00
Have enqueued_at time be nil for jobs that have yet to be enqueued (i.e., are scheduled).
This commit is contained in:
parent
7fb504a7b9
commit
e95379499b
4 changed files with 9 additions and 2 deletions
|
@ -312,7 +312,7 @@ module Sidekiq
|
||||||
end
|
end
|
||||||
|
|
||||||
def enqueued_at
|
def enqueued_at
|
||||||
Time.at(@item['enqueued_at'] || 0).utc
|
@item['enqueued_at'] ? Time.at(@item['enqueued_at']).utc : nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def created_at
|
def created_at
|
||||||
|
|
|
@ -207,6 +207,12 @@ class TestApi < Sidekiq::Test
|
||||||
assert_equal 0, q.size
|
assert_equal 0, q.size
|
||||||
end
|
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
|
it 'unwraps delayed jobs' do
|
||||||
ApiWorker.delay.foo(1,2,3)
|
ApiWorker.delay.foo(1,2,3)
|
||||||
q = Sidekiq::Queue.new
|
q = Sidekiq::Queue.new
|
||||||
|
|
|
@ -74,3 +74,4 @@ en: # <---- change this to your locale code
|
||||||
QuietAll: Quiet All
|
QuietAll: Quiet All
|
||||||
PollingInterval: Polling interval
|
PollingInterval: Polling interval
|
||||||
Plugins: Plugins
|
Plugins: Plugins
|
||||||
|
NotYetEnqueued: Not yet enqueued
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= t('Enqueued') %></th>
|
<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>
|
</tr>
|
||||||
<% unless retry_extra_items(job).empty? %>
|
<% unless retry_extra_items(job).empty? %>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue