Skip to content

Commit 9dbdf36

Browse files
committed
Add timezone to failed_at/retried_at on resque-web to show relative time correctly when a viewer is in a different timezone from a server.
1 parent 246a082 commit 9dbdf36

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/resque/server.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
require 'erb'
33
require 'resque'
44
require 'resque/version'
5+
require 'time'
56

67
module Resque
78
class Server < Sinatra::Base

lib/resque/server/views/failed.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<% else %>
2323
<dt>Worker</dt>
2424
<dd>
25-
<a href="<%= u(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= job['failed_at'] %></span></b>
25+
<a href="<%= u(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= Time.parse(job['failed_at']).strftime("%F %T %z") %></span></b>
2626
<% if job['retried_at'] %>
2727
<div class='retried'>
28-
Retried <b><span class="time"><%= job['retried_at'] %></span></b>
28+
Retried <b><span class="time"><%= Time.parse(job['retried_at']).strftime("%F %T %z") %></span></b>
2929
<a href="<%= u "failed/remove/#{start + index - 1}" %>" class="remove" rel="remove">Remove</a>
3030
</div>
3131
<% else %>

0 commit comments

Comments
 (0)